Cleanup method order: validate before builders

Author: avit

lib/ice_cube/validations/daily_interval.rb

@@ -24,6 +24,15 @@ def type
         :day
       end
 
+      def validate(time, schedule)
+        time_date = Date.new(time.year, time.month, time.day)
+        start_date = Date.new(schedule.start_time.year, schedule.start_time.month, schedule.start_time.day)
+        days = time_date - start_date
+        unless days % interval === 0
+          interval - (days % interval)
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Daily' : "Every #{interval} days"
       end
@@ -37,15 +46,6 @@ def build_ical(builder)
         builder['INTERVAL'] << interval unless interval == 1
       end
 
-      def validate(time, schedule)
-        time_date = Date.new(time.year, time.month, time.day)
-        start_date = Date.new(schedule.start_time.year, schedule.start_time.month, schedule.start_time.day)
-        days = time_date - start_date
-        unless days % interval === 0
-          interval - (days % interval)
-        end
-      end
-
     end
 
   end

lib/ice_cube/validations/day_of_week.rb

@@ -26,6 +26,22 @@ def type
         :day
       end
 
+      def validate(time, schedule)
+        # count the days to the weekday
+        sum = day >= time.wday ? day - time.wday : 7 - time.wday + day
+        wrapper = TimeUtil::TimeWrapper.new(time)
+        wrapper.add :day, sum
+        # and then count the week until a viable occ
+        loop do
+          which_occ, num_occ = TimeUtil.which_occurrence_in_month(wrapper.to_time, day)
+          this_occ = occ < 0 ? num_occ + occ + 1 : occ
+          break if which_occ == this_occ
+          sum += 7
+          wrapper.add :day, 7 # one week
+        end
+        sum
+      end
+
       StringBuilder.register_formatter(:day_of_week) do |segments|
         'on the ' + segments.join(' and ')
       end
@@ -47,22 +63,6 @@ def build_hash(builder)
         arr << occ
       end
 
-      def validate(time, schedule)
-        # count the days to the weekday
-        sum = day >= time.wday ? day - time.wday : 7 - time.wday + day
-        wrapper = TimeUtil::TimeWrapper.new(time)
-        wrapper.add :day, sum
-        # and then count the week until a viable occ
-        loop do
-          which_occ, num_occ = TimeUtil.which_occurrence_in_month(wrapper.to_time, day)
-          this_occ = occ < 0 ? num_occ + occ + 1 : occ
-          break if which_occ == this_occ
-          sum += 7
-          wrapper.add :day, 7 # one week
-        end
-        sum
-      end
-
     end
 
   end

lib/ice_cube/validations/day_of_year.rb

@@ -25,6 +25,14 @@ def type
         :day
       end
 
+      def validate(time, schedule)
+        days_in_year = TimeUtil.days_in_year(time)
+        the_day = day < 0 ? day + days_in_year : day
+        # compute the diff
+        diff = the_day - time.yday
+        diff >= 0 ? diff : diff + days_in_year
+      end
+
       StringBuilder.register_formatter(:day_of_year) do |entries|
         str = "on the #{StringBuilder.sentence(entries)} "
         str << (entries.size == 1 ? 'day of the year' : 'days of the year')
@@ -43,14 +51,6 @@ def build_ical(builder)
         builder['BYYEARDAY'] << day
       end
 
-      def validate(time, schedule)
-        days_in_year = TimeUtil.days_in_year(time)
-        the_day = day < 0 ? day + days_in_year : day
-        # compute the diff
-        diff = the_day - time.yday
-        diff >= 0 ? diff : diff + days_in_year
-      end
-
     end
 
   end

lib/ice_cube/validations/hourly_interval.rb

@@ -25,6 +25,16 @@ def dst_adjust?
         false
       end
 
+      def validate(time, schedule)
+        start_time = schedule.start_time
+        sec = (time.to_i - time.to_i % ONE_HOUR) -
+          (start_time.to_i - start_time.to_i % ONE_HOUR)
+        hours = sec / ONE_HOUR
+        unless hours % interval == 0
+          interval - (hours % interval)
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Hourly' : "Every #{interval} hours"
       end
@@ -38,16 +48,6 @@ def build_ical(builder)
         builder['INTERVAL'] << interval unless interval == 1
       end
 
-      def validate(time, schedule)
-        start_time = schedule.start_time
-        sec = (time.to_i - time.to_i % ONE_HOUR) -
-          (start_time.to_i - start_time.to_i % ONE_HOUR)
-        hours = sec / ONE_HOUR
-        unless hours % interval == 0
-          interval - (hours % interval)
-        end
-      end
-
     end
 
   end

lib/ice_cube/validations/minutely_interval.rb

@@ -25,6 +25,16 @@ def dst_adjust?
         false
       end
 
+      def validate(time, schedule)
+        start_time = schedule.start_time
+        sec = (time.to_i - time.to_i % ONE_MINUTE) -
+          (start_time.to_i - start_time.to_i % ONE_MINUTE)
+        minutes = sec / ONE_MINUTE
+        unless minutes % interval == 0
+          interval - (minutes % interval)
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Minutely' : "Every #{interval} minutes"
       end
@@ -38,16 +48,6 @@ def build_hash(builder)
         builder[:interval] = interval
       end
 
-      def validate(time, schedule)
-        start_time = schedule.start_time
-        sec = (time.to_i - time.to_i % ONE_MINUTE) -
-          (start_time.to_i - start_time.to_i % ONE_MINUTE)
-        minutes = sec / ONE_MINUTE
-        unless minutes % interval == 0
-          interval - (minutes % interval)
-        end
-      end
-
     end
 
   end

lib/ice_cube/validations/monthly_interval.rb

@@ -21,6 +21,14 @@ def type
         :month
       end
 
+      def validate(time, schedule)
+        start_time = schedule.start_time
+        months_to_start = (time.month - start_time.month) + (time.year - start_time.year) * 12
+        unless months_to_start % interval == 0
+          interval - (months_to_start % interval)
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Monthly' : "Every #{interval} months"
       end
@@ -34,14 +42,6 @@ def build_hash(builder)
         builder[:interval] = interval
       end
 
-      def validate(time, schedule)
-        start_time = schedule.start_time
-        months_to_start = (time.month - start_time.month) + (time.year - start_time.year) * 12
-        unless months_to_start % interval == 0
-          interval - (months_to_start % interval)
-        end
-      end
-
     end
 
   end

lib/ice_cube/validations/secondly_interval.rb

@@ -25,6 +25,13 @@ def dst_adjust?
         false
       end
 
+      def validate(time, schedule)
+        seconds = time.to_i - schedule.start_time.to_i
+        unless seconds % interval == 0
+          interval - (seconds % interval)
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Secondly' : "Every #{interval} seconds"
       end
@@ -38,13 +45,6 @@ def build_hash(builder)
         builder[:interval] = interval
       end
 
-      def validate(time, schedule)
-        seconds = time.to_i - schedule.start_time.to_i
-        unless seconds % interval == 0
-          interval - (seconds % interval)
-        end
-      end
-
     end
 
   end

lib/ice_cube/validations/until.rb

@@ -29,6 +29,10 @@ def type
         :dealbreaker
       end
 
+      def validate(t, schedule)
+        raise UntilExceeded if t > time
+      end
+
       def build_ical(builder)
         builder['UNTIL'] << IcalBuilder.ical_utc_format(time)
       end
@@ -41,10 +45,6 @@ def build_s(builder)
         builder.piece(:until) << "until #{time.strftime(IceCube.to_s_time_format)}"
       end
 
-      def validate(t, schedule)
-        raise UntilExceeded if t > time
-      end
-
     end
 
   end

lib/ice_cube/validations/weekly_interval.rb

@@ -29,6 +29,19 @@ def type
         :day
       end
 
+      def validate(time, schedule)
+        date = Date.new(time.year, time.month, time.day)
+        st = schedule.start_time
+        start_date = Date.new(st.year, st.month, st.day)
+        weeks = (
+          (date - TimeUtil.normalize_wday(date.wday, week_start)) -
+          (start_date - TimeUtil.normalize_wday(start_date.wday, week_start))
+        ) / 7
+        unless weeks % interval == 0
+          (interval - (weeks % interval)) * 7
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Weekly' : "Every #{interval} weeks"
       end
@@ -46,19 +59,6 @@ def build_hash(builder)
         builder[:week_start] = TimeUtil.sym_to_wday(week_start)
       end
 
-      def validate(time, schedule)
-        date = Date.new(time.year, time.month, time.day)
-        st = schedule.start_time
-        start_date = Date.new(st.year, st.month, st.day)
-        weeks = (
-          (date - TimeUtil.normalize_wday(date.wday, week_start)) -
-          (start_date - TimeUtil.normalize_wday(start_date.wday, week_start))
-        ) / 7
-        unless weeks % interval == 0
-          (interval - (weeks % interval)) * 7
-        end
-      end
-
     end
 
   end

lib/ice_cube/validations/yearly_interval.rb

@@ -20,6 +20,13 @@ def type
         :year
       end
 
+      def validate(time, schedule)
+        years_to_start = time.year - schedule.start_time.year
+        unless years_to_start % interval == 0
+          interval - (years_to_start % interval)
+        end
+      end
+
       def build_s(builder)
         builder.base = interval == 1 ? 'Yearly' : "Every #{interval} years"
       end
@@ -35,13 +42,6 @@ def build_ical(builder)
         end
       end
 
-      def validate(time, schedule)
-        years_to_start = time.year - schedule.start_time.year
-        unless years_to_start % interval == 0
-          interval - (years_to_start % interval)
-        end
-      end
-
     end
 
   end