ice_cube 0.10.0 → 0.10.1

data/lib/ice_cube/occurrence.rb

@@ -21,6 +21,11 @@ module IceCube
   #
   class Occurrence < SimpleDelegator
 
+    # Report class name as 'Time' to thwart type checking.
+    def self.name
+      'Time'
+    end
+
     # Optimize for common methods to avoid method_missing
     extend Forwardable
     def_delegators :start_time, :to_s, :to_i, :<=>, :==

data/lib/ice_cube/rules/daily_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::DailyInterval
 
     def initialize(interval = 1)
+      super
       interval(interval)
       schedule_lock(:hour, :min, :sec)
       reset

data/lib/ice_cube/rules/hourly_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::HourlyInterval
 
     def initialize(interval = 1)
+      super
       interval(interval)
       schedule_lock(:min, :sec)
       reset

data/lib/ice_cube/rules/minutely_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::MinutelyInterval
 
     def initialize(interval = 1)
+      super
       interval(interval)
       schedule_lock(:sec)
       reset

data/lib/ice_cube/rules/monthly_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::MonthlyInterval
 
     def initialize(interval = 1)
+      super
       interval(interval)
       schedule_lock(:day, :hour, :min, :sec)
       reset

data/lib/ice_cube/rules/secondly_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::SecondlyInterval
 
     def initialize(interval = 1)
+      super
       interval(interval)
       reset
     end

data/lib/ice_cube/rules/weekly_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::WeeklyInterval
 
     def initialize(interval = 1, week_start = :sunday)
+      super
       interval(interval, week_start)
       schedule_lock(:wday, :hour, :min, :sec)
       reset

data/lib/ice_cube/rules/yearly_rule.rb

@@ -5,6 +5,7 @@ module IceCube
     include Validations::YearlyInterval
 
     def initialize(interval = 1)
+      super
       interval(interval)
       schedule_lock(:month, :day, :hour, :min, :sec)
       reset

data/lib/ice_cube/schedule.rb

@@ -150,7 +150,7 @@ module IceCube
 
     # All of the occurrences
     def all_occurrences
-      raise ArgumentError.new('Rule must specify either an until date or a count to use #all_occurrences') unless terminating?
+      require_terminating_rules
       find_occurrences(start_time)
     end
 
@@ -174,6 +174,7 @@ module IceCube
 
     # The remaining occurrences (same requirements as all_occurrences)
     def remaining_occurrences(from = nil)
+      require_terminating_rules
       from ||= TimeUtil.now(@start_time)
       find_occurrences(from)
     end
@@ -426,6 +427,12 @@ module IceCube
       end
     end
 
+    def require_terminating_rules
+      return true if terminating?
+      method_name = caller[0].split(' ').last
+      raise ArgumentError, "All recurrence rules must specify .until or .count to use #{method_name}"
+    end
+
     def implicit_start_occurrence
       SingleOccurrenceRule.new(start_time)
     end

data/lib/ice_cube/time_util.rb

@@ -22,6 +22,7 @@ module IceCube
     end
 
     def self.match_zone(time, reference)
+      return unless time = ensure_time(time)
       if reference.respond_to? :time_zone
         time.in_time_zone(reference.time_zone)
       else
@@ -160,7 +161,7 @@ module IceCube
     # overflowing shorter months
     def self.days_to_next_month(time)
       date = Date.new(time.year, time.month, time.day)
-      (date >> 1) - date
+      ((date >> 1) - date).to_i
     end
 
     # Get a day of the month in the month of a given time without overflowing

data/lib/ice_cube/validated_rule.rb

@@ -30,6 +30,10 @@ module IceCube
       :interval
     ]
 
+    def initialize(interval = 1, *)
+      @validations = Hash.new
+    end
+
     # Compute the next time after (or including) the specified time in respect
     # to the given schedule
     def next_time(time, schedule, closing_time)
@@ -74,7 +78,6 @@ module IceCube
 
     # Get the collection that contains validations of a certain type
     def validations_for(key)
-      @validations ||= {}
       @validations[key] ||= []
     end
 

data/lib/ice_cube/validations/count.rb

@@ -8,8 +8,11 @@ module IceCube
     end
 
     def count(max)
+      unless max.nil? || max.is_a?(Fixnum)
+        raise ArgumentError, "Expecting Fixnum or nil value for count, got #{max.inspect}"
+      end
       @count = max
-      replace_validations_for(:count, [Validation.new(max, self)]) # replace
+      replace_validations_for(:count, [Validation.new(max, self)])
       self
     end
 

data/lib/ice_cube/validations/daily_interval.rb

@@ -5,7 +5,7 @@ module IceCube
     # Add a new interval validation
     def interval(interval)
       @interval = interval
-      validations_for(:interval) << Validation.new(interval)
+      replace_validations_for(:interval, [Validation.new(interval)])
       clobber_base_validations(:wday, :day)
       self
     end

data/lib/ice_cube/validations/day.rb

@@ -5,7 +5,10 @@ module IceCube
   module Validations::Day
 
     def day(*days)
-      days.each do |day|
+      days.flatten.each do |day|
+        unless day.is_a?(Fixnum) || day.is_a?(Symbol)
+          raise ArgumentError, "expecting Fixnum or Symbol value for day, got #{day.inspect}"
+        end
         day = TimeUtil.sym_to_wday(day)
         validations_for(:day) << Validation.new(day)
       end

data/lib/ice_cube/validations/day_of_month.rb

@@ -5,7 +5,10 @@ module IceCube
     include Validations::Lock
 
     def day_of_month(*days)
-      days.each do |day|
+      days.flatten.each do |day|
+        unless day.is_a?(Fixnum)
+          raise ArgumentError, "expecting Fixnum value for day, got #{day.inspect}"
+        end
         validations_for(:day_of_month) << Validation.new(day)
       end
       clobber_base_validations(:day, :wday)

data/lib/ice_cube/validations/day_of_year.rb

@@ -3,7 +3,10 @@ module IceCube
   module Validations::DayOfYear
 
     def day_of_year(*days)
-      days.each do |day|
+      days.flatten.each do |day|
+        unless day.is_a?(Fixnum)
+          raise ArgumentError, "expecting Fixnum value for day, got #{day.inspect}"
+        end
         validations_for(:day_of_year) << Validation.new(day)
       end
       clobber_base_validations(:month, :day, :wday)

data/lib/ice_cube/validations/hour_of_day.rb

@@ -6,7 +6,10 @@ module IceCube
 
     # Add hour of day validations
     def hour_of_day(*hours)
-      hours.each do |hour|
+      hours.flatten.each do |hour|
+        unless hour.is_a?(Fixnum)
+          raise ArgumentError, "expecting Fixnum value for hour, got #{hour.inspect}"
+        end
         validations_for(:hour_of_day) << Validation.new(hour)
       end
       clobber_base_validations(:hour)

data/lib/ice_cube/validations/hourly_interval.rb

@@ -4,7 +4,7 @@ module IceCube
 
     def interval(interval)
       @interval = interval
-      validations_for(:interval) << Validation.new(interval)
+      replace_validations_for(:interval, [Validation.new(interval)])
       clobber_base_validations(:hour)
       self
     end

data/lib/ice_cube/validations/lock.rb

@@ -62,8 +62,8 @@ module IceCube
       if value && value > 0
         until_next_month = days_in_month + sleeps
       else
-        until_next_month = TimeUtil.days_to_next_month(date) + sleeps
-        until_next_month -= month_overflow
+        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

data/lib/ice_cube/validations/minute_of_hour.rb

@@ -5,7 +5,10 @@ module IceCube
     include Validations::Lock
 
     def minute_of_hour(*minutes)
-      minutes.each do |minute|
+      minutes.flatten.each do |minute|
+        unless minute.is_a?(Fixnum)
+          raise ArgumentError, "expecting Fixnum value for minute, got #{minute.inspect}"
+        end
         validations_for(:minute_of_hour) << Validation.new(minute)
       end
       clobber_base_validations(:min)

data/lib/ice_cube/validations/minutely_interval.rb

@@ -4,7 +4,7 @@ module IceCube
 
     def interval(interval)
       @interval = interval
-      validations_for(:interval) << Validation.new(interval)
+      replace_validations_for(:interval, [Validation.new(interval)])
       clobber_base_validations(:min)
       self
     end

data/lib/ice_cube/validations/month_of_year.rb

@@ -3,7 +3,10 @@ module IceCube
   module Validations::MonthOfYear
 
     def month_of_year(*months)
-      months.each do |month|
+      months.flatten.each do |month|
+        unless month.is_a?(Fixnum) || month.is_a?(Symbol)
+          raise ArgumentError, "expecting Fixnum or Symbol value for month, got #{month.inspect}"
+        end
         month = TimeUtil.sym_to_month(month)
         validations_for(:month_of_year) << Validation.new(month)
       end

data/lib/ice_cube/validations/monthly_interval.rb

@@ -2,9 +2,9 @@ module IceCube
 
   module Validations::MonthlyInterval
 
-    def interval(interval = 1)
+    def interval(interval)
       @interval = interval
-      validations_for(:interval) << Validation.new(interval)
+      replace_validations_for(:interval, [Validation.new(interval)])
       clobber_base_validations(:month)
       self
     end

data/lib/ice_cube/validations/second_of_minute.rb

@@ -3,7 +3,10 @@ module IceCube
   module Validations::SecondOfMinute
 
     def second_of_minute(*seconds)
-      seconds.each do |second|
+      seconds.flatten.each do |second|
+      unless second.is_a?(Fixnum)
+        raise ArgumentError, "Expecting Fixnum value for second, got #{second.inspect}"
+      end
         validations_for(:second_of_minute) << Validation.new(second)
       end
       clobber_base_validations :sec

data/lib/ice_cube/validations/secondly_interval.rb

@@ -4,7 +4,7 @@ module IceCube
 
     def interval(interval)
       @interval = interval
-      validations_for(:interval) << Validation.new(interval)
+      replace_validations_for(:interval, [Validation.new(interval)])
       clobber_base_validations(:sec)
       self
     end

data/lib/ice_cube/validations/until.rb

@@ -11,7 +11,7 @@ module IceCube
     deprecated_alias :until_date, :until_time
 
     def until(time)
-      time = TimeUtil.ensure_time time, true
+      time = TimeUtil.ensure_time(time, true)
       @until = time
       replace_validations_for(:until, time.nil? ? nil : [Validation.new(time)])
       self

data/lib/ice_cube/validations/weekly_interval.rb

@@ -7,7 +7,7 @@ module IceCube
     def interval(interval, week_start = :sunday)
       @interval = interval
       @week_start = TimeUtil.wday_to_sym(week_start)
-      validations_for(:interval) << Validation.new(interval, week_start)
+      replace_validations_for(:interval, [Validation.new(interval, week_start)])
       clobber_base_validations(:day)
       self
     end

data/lib/ice_cube/validations/yearly_interval.rb

@@ -2,9 +2,9 @@ module IceCube
 
   module Validations::YearlyInterval
 
-    def interval(interval = 1)
+    def interval(interval)
       @interval = interval
-      validations_for(:interval) << Validation.new(interval)
+      replace_validations_for(:interval, [Validation.new(interval)])
       clobber_base_validations(:year)
     end
 

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 
 end

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
+  prerelease: 
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
@@ -119,26 +128,33 @@ files:
 homepage: http://seejohnrun.github.com/ice_cube/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2800901123420442900
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2800901123420442900
 requirements: []
 rubyforge_project: ice-cube
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby Date Recurrence Library
 test_files:
 - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0cc5c669bd801317d8256d7fc8b77841e80dae6e
-  data.tar.gz: 6bda80589b1d0a91d54ea2d7b4194d320e26b2ac
-SHA512:
-  metadata.gz: d3a10207a9dc7368b3cc6f045160c2b3f6651e1a95570a8d6c58af689eb616deb47291485b514b4ec58b1275595dce7f7c21f1606341d624449edfc5c842648d
-  data.tar.gz: 0abec738ddd565630a8a92468a8db708c2c18e2601abe3824ba10b766ce952341d7ff90da50a7ac6f4349d079661d66e8b131f177cbf4ee2853b4b046d4389a6