ice_cube 0.16.3 → 0.17.0

data/lib/ice_cube/validations/day_of_month.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::DayOfMonth
-
     def day_of_month(*days)
       days.flatten.each do |day|
         unless day.is_a?(Integer)
@@ -15,9 +13,8 @@ module IceCube
     end
 
     class Validation < Validations::FixedValue
-
       attr_reader :day
-      alias :value :day
+      alias_method :value, :day
 
       def initialize(day)
         @day = day
@@ -44,17 +41,14 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['BYMONTHDAY'] << day
+        builder["BYMONTHDAY"] << day
       end
 
       StringBuilder.register_formatter(:day_of_month) do |entries|
         sentence = StringBuilder.sentence(entries)
-        str = IceCube::I18n.t('ice_cube.days_of_month', count: entries.size, segments: sentence)
-        IceCube::I18n.t('ice_cube.on', sentence: str)
+        str = IceCube::I18n.t("ice_cube.days_of_month", count: entries.size, segments: sentence)
+        IceCube::I18n.t("ice_cube.on", sentence: str)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/day_of_week.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::DayOfWeek
-
     def day_of_week(dows)
       dows.each do |day, occs|
         occs.each do |occ|
@@ -14,10 +12,12 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :day, :occ
 
       def initialize(day, occ)
+        raise ArgumentError, "Integer occurrence value required" unless occ.is_a?(Integer)
+        raise ArgumentError, "Invalid day_of_week occurrence: #{occ.inspect}" if occ.zero? || occ.abs > 5
+
         @day = day
         @occ = occ
       end
@@ -37,7 +37,7 @@ module IceCube
         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)
+          this_occ = (occ < 0) ? (num_occ + occ + 1) : occ
           break offset if which_occ == this_occ
           wrapper.add :day, 7
           offset += 7
@@ -46,9 +46,9 @@ module IceCube
 
       def build_s(builder)
         builder.piece(:day_of_week) << IceCube::I18n.t(
-          'ice_cube.days_of_week',
+          "ice_cube.days_of_week",
           segments: StringBuilder.nice_number(occ),
-          day: IceCube::I18n.t('date.day_names')[day]
+          day: IceCube::I18n.t("date.day_names")[day]
         )
       end
 
@@ -61,17 +61,14 @@ module IceCube
       def build_ical(builder)
         ical_day = IcalBuilder.fixnum_to_ical_day(day)
         # Delete any with this day and no occ first
-        builder['BYDAY'].delete_if { |d| d == ical_day }
-        builder['BYDAY'] << "#{occ}#{ical_day}"
+        builder["BYDAY"].delete_if { |d| d == ical_day }
+        builder["BYDAY"] << "#{occ}#{ical_day}"
       end
 
       StringBuilder.register_formatter(:day_of_week) do |segments|
-        sentence = segments.join(IceCube::I18n.t('ice_cube.array.two_words_connector'))
-        IceCube::I18n.t('ice_cube.on', sentence: sentence)
+        sentence = segments.join(IceCube::I18n.t("ice_cube.array.two_words_connector"))
+        IceCube::I18n.t("ice_cube.on", sentence: sentence)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/day_of_year.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::DayOfYear
-
     def day_of_year(*days)
       days.flatten.each do |day|
         unless day.is_a?(Integer)
@@ -14,7 +12,6 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :day
 
       def initialize(day)
@@ -31,9 +28,9 @@ module IceCube
 
       def validate(step_time, start_time)
         days_in_year = TimeUtil.days_in_year(step_time)
-        yday = day < 0 ? day + days_in_year + 1 : day
+        yday = (day < 0) ? day + days_in_year + 1 : day
         offset = yday - step_time.yday
-        offset >= 0 ? offset : offset + days_in_year
+        (offset >= 0) ? offset : offset + days_in_year
       end
 
       def build_s(builder)
@@ -45,17 +42,14 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['BYYEARDAY'] << day
+        builder["BYYEARDAY"] << day
       end
 
       StringBuilder.register_formatter(:day_of_year) do |entries|
-        str =  StringBuilder.sentence(entries)
-        sentence = IceCube::I18n.t('ice_cube.days_of_year', count: entries.size, segments: str)
-        IceCube::I18n.t('ice_cube.on', sentence: sentence)
+        str = StringBuilder.sentence(entries)
+        sentence = IceCube::I18n.t("ice_cube.days_of_year", count: entries.size, segments: str)
+        IceCube::I18n.t("ice_cube.on", sentence: sentence)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/fixed_value.rb

@@ -1,5 +1,4 @@
 module IceCube
-
   # This abstract validation class is used by the various "fixed-time" (e.g.
   # day, day_of_month, hour_of_day) Validation and ScheduleLock::Validation
   # modules. It is not a standalone rule validation module like the others.
@@ -9,12 +8,11 @@ module IceCube
   # start_time
   #
   class Validations::FixedValue
-
-    INTERVALS = {:min => 60, :sec => 60, :hour => 24, :month => 12, :wday => 7}
+    INTERVALS = {min: 60, sec: 60, hour: 24, month: 12, wday: 7}
 
     def validate(time, start_time)
       case type
-      when :day  then validate_day_lock(time, start_time)
+      when :day then validate_day_lock(time, start_time)
       when :hour then validate_hour_lock(time, start_time)
       else validate_interval_lock(time, start_time)
       end
@@ -28,7 +26,7 @@ module IceCube
     def validate_interval_lock(time, start_time)
       t0 = starting_unit(start_time)
       t1 = time.send(type)
-      t0 >= t1 ? t0 - t1 : INTERVALS[type] - t1 + t0
+      (t0 >= t1) ? t0 - t1 : INTERVALS[type] - t1 + t0
     end
 
     # Lock the hour if explicitly set by hour_of_day, but allow for the nearest
@@ -39,12 +37,10 @@ module IceCube
       h1 = time.hour
       if h0 >= h1
         h0 - h1
+      elsif (dst_offset = TimeUtil.dst_change(time))
+        h0 - h1 + dst_offset
       else
-        if dst_offset = TimeUtil.dst_change(time)
-          h0 - h1 + dst_offset
-        else
-          24 - h1 + h0
-        end
+        24 - h1 + h0
       end
     end
 
@@ -77,19 +73,17 @@ module IceCube
       if value && value > 0
         until_next_month = days_in_month + sleeps
       else
-        until_next_month = start < 28 ? days_in_month : TimeUtil.days_to_next_month(date)
+        until_next_month = (start < 28) ? days_in_month : TimeUtil.days_to_next_month(date)
         until_next_month += sleeps - month_overflow
       end
 
-      sleeps >= 0 ? sleeps : until_next_month
+      (sleeps >= 0) ? sleeps : until_next_month
     end
 
     def starting_unit(start_time)
       start = value || start_time.send(type)
-      start = start % INTERVALS[type] if start < 0
+      start %= INTERVALS[type] if start < 0
       start
     end
-
   end
-
 end

data/lib/ice_cube/validations/hour_of_day.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::HourOfDay
-
     # Add hour of day validations
     def hour_of_day(*hours)
       hours.flatten.each do |hour|
@@ -22,21 +20,20 @@ module IceCube
       freq = base_interval_validation.interval
 
       first_hour = Array(validations[:hour_of_day]).min_by(&:value)
-      time = TimeUtil::TimeWrapper.new(start_time, false)
-      if freq > 1
+      time = TimeUtil::TimeWrapper.new(start_time, true)
+      if freq > 1 && base_interval_validation.type == :hour
         offset = first_hour.validate(opening_time, start_time)
         time.add(:hour, offset - freq)
       else
         time.hour = first_hour.value
       end
 
-      super opening_time, time.to_time
+      super(opening_time, time.to_time)
     end
 
     class Validation < Validations::FixedValue
-
       attr_reader :hour
-      alias :value :hour
+      alias_method :value, :hour
 
       def initialize(hour)
         @hour = hour
@@ -63,16 +60,13 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['BYHOUR'] << hour
+        builder["BYHOUR"] << hour
       end
 
       StringBuilder.register_formatter(:hour_of_day) do |segments|
         str = StringBuilder.sentence(segments)
-        IceCube::I18n.t('ice_cube.at_hours_of_the_day', count: segments.size, segments: str)
+        IceCube::I18n.t("ice_cube.at_hours_of_the_day", count: segments.size, segments: str)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/hourly_interval.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::HourlyInterval
-
     def interval(interval)
       verify_alignment(interval, :hour, :interval) { |error| raise error }
 
@@ -12,7 +10,6 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :interval
 
       def initialize(interval)
@@ -30,7 +27,7 @@ module IceCube
       def validate(step_time, start_time)
         t0, t1 = start_time.to_i, step_time.to_i
         sec = (t1 - t1 % ONE_HOUR) -
-              (t0 - t0 % ONE_HOUR)
+          (t0 - t0 % ONE_HOUR)
         hours = sec / ONE_HOUR
         offset = (hours % interval).nonzero?
         interval - offset if offset
@@ -45,12 +42,9 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['FREQ'] << 'HOURLY'
-        builder['INTERVAL'] << interval unless interval == 1
+        builder["FREQ"] << "HOURLY"
+        builder["INTERVAL"] << interval unless interval == 1
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/lock.rb

@@ -1,5 +1,4 @@
 module IceCube
-
   # This validation mixin is used by the various "fixed-time" (e.g. day,
   # day_of_month, hour_of_day) Validation and ScheduleLock::Validation modules.
   # It is not a standalone rule validation like the others.
@@ -9,12 +8,11 @@ module IceCube
   # schedule's start_time
   #
   module Validations::Lock
-
-    INTERVALS = {:min => 60, :sec => 60, :hour => 24, :month => 12, :wday => 7}
+    INTERVALS = {min: 60, sec: 60, hour: 24, month: 12, wday: 7}
 
     def validate(time, start_time)
       case type
-      when :day  then validate_day_lock(time, start_time)
+      when :day then validate_day_lock(time, start_time)
       when :hour then validate_hour_lock(time, start_time)
       else validate_interval_lock(time, start_time)
       end
@@ -28,7 +26,7 @@ module IceCube
     def validate_interval_lock(time, start_time)
       t0 = starting_unit(start_time)
       t1 = time.send(type)
-      t0 >= t1 ? t0 - t1 : INTERVALS[type] - t1 + t0
+      (t0 >= t1) ? t0 - t1 : INTERVALS[type] - t1 + t0
     end
 
     # Lock the hour if explicitly set by hour_of_day, but allow for the nearest
@@ -39,12 +37,10 @@ module IceCube
       h1 = time.hour
       if h0 >= h1
         h0 - h1
+      elsif (dst_offset = TimeUtil.dst_change(time))
+        h0 - h1 + dst_offset
       else
-        if dst_offset = TimeUtil.dst_change(time)
-          h0 - h1 + dst_offset
-        else
-          24 - h1 + h0
-        end
+        24 - h1 + h0
       end
     end
 
@@ -77,11 +73,11 @@ module IceCube
       if value && value > 0
         until_next_month = days_in_month + sleeps
       else
-        until_next_month = start < 28 ? days_in_month : TimeUtil.days_to_next_month(date)
+        until_next_month = (start < 28) ? days_in_month : TimeUtil.days_to_next_month(date)
         until_next_month += sleeps - month_overflow
       end
 
-      sleeps >= 0 ? sleeps : until_next_month
+      (sleeps >= 0) ? sleeps : until_next_month
     end
 
     def starting_unit(start_time)
@@ -89,7 +85,5 @@ module IceCube
       start += INTERVALS[type] while start < 0
       start
     end
-
   end
-
 end

data/lib/ice_cube/validations/minute_of_hour.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::MinuteOfHour
-
     def minute_of_hour(*minutes)
       minutes.flatten.each do |minute|
         unless minute.is_a?(Integer)
@@ -22,13 +20,12 @@ module IceCube
       first_minute = validations[:minute_of_hour].min_by(&:value)
       time = TimeUtil::TimeWrapper.new(start_time, false)
       time.min = first_minute.value
-      super opening_time, time.to_time
+      super(opening_time, time.to_time)
     end
 
     class Validation < Validations::FixedValue
-
       attr_reader :minute
-      alias :value :minute
+      alias_method :value, :minute
 
       def initialize(minute)
         @minute = minute
@@ -55,16 +52,13 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['BYMINUTE'] << minute
+        builder["BYMINUTE"] << minute
       end
 
       StringBuilder.register_formatter(:minute_of_hour) do |segments|
         str = StringBuilder.sentence(segments)
-        IceCube::I18n.t('ice_cube.on_minutes_of_hour', count: segments.size, segments: str)
+        IceCube::I18n.t("ice_cube.on_minutes_of_hour", count: segments.size, segments: str)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/minutely_interval.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::MinutelyInterval
-
     def interval(interval)
       verify_alignment(interval, :min, :interval) { |error| raise error }
 
@@ -12,7 +10,6 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :interval
 
       def initialize(interval)
@@ -30,14 +27,14 @@ module IceCube
       def validate(step_time, start_time)
         t0, t1 = start_time.to_i, step_time.to_i
         sec = (t1 - t1 % ONE_MINUTE) -
-              (t0 - t0 % ONE_MINUTE)
+          (t0 - t0 % ONE_MINUTE)
         minutes = sec / ONE_MINUTE
         offset = (minutes % interval).nonzero?
         interval - offset if offset
       end
 
       def build_s(builder)
-        builder.base = IceCube::I18n.t('ice_cube.each_minute', count: interval)
+        builder.base = IceCube::I18n.t("ice_cube.each_minute", count: interval)
       end
 
       def build_hash(builder)
@@ -45,12 +42,9 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['FREQ'] << 'MINUTELY'
-        builder['INTERVAL'] << interval unless interval == 1
+        builder["FREQ"] << "MINUTELY"
+        builder["INTERVAL"] << interval unless interval == 1
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/month_of_year.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::MonthOfYear
-
     def month_of_year(*months)
       months.flatten.each do |month|
         unless month.is_a?(Integer) || month.is_a?(Symbol)
@@ -16,9 +14,8 @@ module IceCube
     end
 
     class Validation < Validations::FixedValue
-
       attr_reader :month
-      alias :value :month
+      alias_method :value, :month
 
       def initialize(month)
         @month = month
@@ -45,15 +42,12 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['BYMONTH'] << month
+        builder["BYMONTH"] << month
       end
 
       StringBuilder.register_formatter(:month_of_year) do |segments|
         IceCube::I18n.t("ice_cube.in", target: StringBuilder.sentence(segments))
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/monthly_interval.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::MonthlyInterval
-
     def interval(interval)
       interval = normalized_interval(interval)
       verify_alignment(interval, :month, :interval) { |error| raise error }
@@ -13,7 +11,6 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :interval
 
       def initialize(interval)
@@ -31,13 +28,13 @@ module IceCube
       def validate(step_time, start_time)
         t0, t1 = start_time, step_time
         months = (t1.month - t0.month) +
-                 (t1.year - t0.year) * 12
+          (t1.year - t0.year) * 12
         offset = (months % interval).nonzero?
         interval - offset if offset
       end
 
       def build_s(builder)
-        builder.base = IceCube::I18n.t('ice_cube.each_month', count: interval)
+        builder.base = IceCube::I18n.t("ice_cube.each_month", count: interval)
       end
 
       def build_hash(builder)
@@ -45,12 +42,9 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['FREQ'] << 'MONTHLY'
-        builder['INTERVAL'] << interval unless interval == 1
+        builder["FREQ"] << "MONTHLY"
+        builder["INTERVAL"] << interval unless interval == 1
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/schedule_lock.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::ScheduleLock
-
     # Lock the given time units to the units from schedule's +start_time+
     # These locks are all clobberable by other rules of the same #type
     # using +clobber_base_validation+
@@ -13,7 +11,6 @@ module IceCube
     end
 
     class Validation < Validations::FixedValue
-
       attr_reader :type, :value
 
       def initialize(type)
@@ -42,9 +39,6 @@ module IceCube
       # no -op
       def build_ical(builder)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/second_of_minute.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::SecondOfMinute
-
     def second_of_minute(*seconds)
       seconds.flatten.each do |second|
         unless second.is_a?(Integer)
@@ -22,13 +20,12 @@ module IceCube
       first_second = Array(validations[:second_of_minute]).min_by(&:value)
       time = TimeUtil::TimeWrapper.new(start_time, false)
       time.sec = first_second.value
-      super opening_time, time.to_time
+      super(opening_time, time.to_time)
     end
 
     class Validation < Validations::FixedValue
-
       attr_reader :second
-      alias :value :second
+      alias_method :value, :second
 
       def initialize(second)
         @second = second
@@ -55,16 +52,13 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['BYSECOND'] << second
+        builder["BYSECOND"] << second
       end
 
       StringBuilder.register_formatter(:second_of_minute) do |segments|
         str = StringBuilder.sentence(segments)
-        IceCube::I18n.t('ice_cube.on_seconds_of_minute', count: segments.size, segments: str)
+        IceCube::I18n.t("ice_cube.on_seconds_of_minute", count: segments.size, segments: str)
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/secondly_interval.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::SecondlyInterval
-
     def interval(interval)
       verify_alignment(interval, :sec, :interval) { |error| raise error }
 
@@ -12,7 +10,6 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :interval
 
       def initialize(interval)
@@ -42,12 +39,9 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['FREQ'] << 'SECONDLY'
-        builder['INTERVAL'] << interval unless interval == 1
+        builder["FREQ"] << "SECONDLY"
+        builder["INTERVAL"] << interval unless interval == 1
       end
-
     end
-
   end
-
 end

data/lib/ice_cube/validations/until.rb

@@ -1,7 +1,5 @@
 module IceCube
-
   module Validations::Until
-
     extend Deprecated
 
     # Value reader for limit
@@ -16,7 +14,6 @@ module IceCube
     end
 
     class Validation
-
       attr_reader :time
 
       def initialize(time)
@@ -38,7 +35,7 @@ module IceCube
 
       def build_s(builder)
         date = IceCube::I18n.l(time, format: IceCube.to_s_time_format)
-        builder.piece(:until) << IceCube::I18n.t('ice_cube.until', date: date)
+        builder.piece(:until) << IceCube::I18n.t("ice_cube.until", date: date)
       end
 
       def build_hash(builder)
@@ -46,11 +43,8 @@ module IceCube
       end
 
       def build_ical(builder)
-        builder['UNTIL'] << IcalBuilder.ical_utc_format(time)
+        builder["UNTIL"] << IcalBuilder.ical_utc_format(time)
       end
-
     end
-
   end
-
 end