Clean up validate methods

Author: avit

lib/ice_cube/validations/count.rb

@@ -30,9 +30,7 @@ def type
       end
 
       def validate(time, schedule)
-        if rule.uses && rule.uses >= count
-          raise CountExceeded
-        end
+        raise CountExceeded if rule.uses && rule.uses >= count
       end
 
       def build_s(builder)

lib/ice_cube/validations/daily_interval.rb

@@ -24,13 +24,12 @@ 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
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time, step_time
+        days = Date.new(t1.year, t1.month, t1.day) -
+               Date.new(t0.year, t0.month, t0.day)
+        offset = (days % interval).nonzero?
+        interval - offset if offset
       end
 
       def build_s(builder)

lib/ice_cube/validations/day_of_week.rb

@@ -26,20 +26,18 @@ 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
+      def validate(step_time, schedule)
+        wday = step_time.wday
+        offset = (day < wday) ? (7 - wday + day) : (day - wday)
+        wrapper = TimeUtil::TimeWrapper.new(step_time)
+        wrapper.add :day, offset
         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
+          this_occ = (occ < 0) ? (num_occ + occ + 1) : (occ)
+          break offset if which_occ == this_occ
+          wrapper.add :day, 7
+          offset += 7
         end
-        sum
       end
 
       def build_s(builder)

lib/ice_cube/validations/day_of_year.rb

@@ -25,12 +25,11 @@ 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
+      def validate(step_time, schedule)
+        days_in_year = TimeUtil.days_in_year(step_time)
+        yday = day < 0 ? day + days_in_year : day
+        offset = yday - step_time.yday
+        offset >= 0 ? offset : offset + days_in_year
       end
 
       def build_s(builder)

lib/ice_cube/validations/hourly_interval.rb

@@ -25,14 +25,13 @@ 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)
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time.to_i, step_time.to_i
+        sec = (t1 - t1 % ONE_HOUR) -
+              (t0 - t0 % ONE_HOUR)
         hours = sec / ONE_HOUR
-        unless hours % interval == 0
-          interval - (hours % interval)
-        end
+        offset = (hours % interval).nonzero?
+        interval - offset if offset
       end
 
       def build_s(builder)

lib/ice_cube/validations/minutely_interval.rb

@@ -25,14 +25,13 @@ 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)
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time.to_i, step_time.to_i
+        sec = (t1 - t1 % ONE_MINUTE) -
+              (t0 - t0 % ONE_MINUTE)
         minutes = sec / ONE_MINUTE
-        unless minutes % interval == 0
-          interval - (minutes % interval)
-        end
+        offset = (minutes % interval).nonzero?
+        interval - offset if offset
       end
 
       def build_s(builder)

lib/ice_cube/validations/monthly_interval.rb

@@ -21,12 +21,12 @@ 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
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time, step_time
+        months = (t1.month - t0.month) +
+                 (t1.year - t0.year) * 12
+        offset = (months % interval).nonzero?
+        interval - offset if offset
       end
 
       def build_s(builder)

lib/ice_cube/validations/secondly_interval.rb

@@ -25,11 +25,10 @@ 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
+      def validate(step_time, schedule)
+        seconds = step_time.to_i - schedule.start_time.to_i
+        offset = (seconds % interval).nonzero?
+        interval - offset if offset
       end
 
       def build_s(builder)

lib/ice_cube/validations/until.rb

@@ -29,8 +29,8 @@ def type
         :dealbreaker
       end
 
-      def validate(t, schedule)
-        raise UntilExceeded if t > time
+      def validate(step_time, schedule)
+        raise UntilExceeded if step_time > time
       end
 
       def build_s(builder)

lib/ice_cube/validations/weekly_interval.rb

@@ -29,17 +29,14 @@ 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
+      def validate(step_time, schedule)
+        t0, t1 = schedule.start_time, step_time
+        d0 = Date.new(t0.year, t0.month, t0.day)
+        d1 = Date.new(t1.year, t1.month, t1.day)
+        days = (d1 - TimeUtil.normalize_wday(d1.wday, week_start)) -
+               (d0 - TimeUtil.normalize_wday(d0.wday, week_start))
+        offset = ((days / 7) % interval).nonzero?
+        (interval - offset) * 7 if offset
       end
 
       def build_s(builder)