ice_cube 0.9.2 → 0.9.3

data/lib/ice_cube/rule.rb

@@ -66,7 +66,7 @@ module IceCube
     end
 
     def on?(time, schedule)
-      next_time(time, schedule, time) == time
+      next_time(time, schedule, time).to_i == time.to_i
     end
 
     # Whether this rule requires a full run

data/lib/ice_cube/rules/daily_rule.rb

@@ -7,6 +7,7 @@ module IceCube
     def initialize(interval = 1)
       interval(interval)
       schedule_lock(:hour, :min, :sec)
+      reset
     end
 
   end

data/lib/ice_cube/rules/hourly_rule.rb

@@ -7,6 +7,7 @@ module IceCube
     def initialize(interval = 1)
       interval(interval)
       schedule_lock(:min, :sec)
+      reset
     end
 
   end

data/lib/ice_cube/rules/minutely_rule.rb

@@ -7,6 +7,7 @@ module IceCube
     def initialize(interval = 1)
       interval(interval)
       schedule_lock(:sec)
+      reset
     end
 
   end

data/lib/ice_cube/rules/monthly_rule.rb

@@ -7,6 +7,7 @@ module IceCube
     def initialize(interval = 1)
       interval(interval)
       schedule_lock(:day, :hour, :min, :sec)
+      reset
     end
 
   end

data/lib/ice_cube/rules/secondly_rule.rb

@@ -6,6 +6,7 @@ module IceCube
 
     def initialize(interval = 1)
       interval(interval)
+      reset
     end
 
   end

data/lib/ice_cube/rules/weekly_rule.rb

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

data/lib/ice_cube/rules/yearly_rule.rb

@@ -7,6 +7,7 @@ module IceCube
     def initialize(interval = 1)
       interval(interval)
       schedule_lock(:month, :day, :hour, :min, :sec)
+      reset
     end
 
   end

data/lib/ice_cube/schedule.rb

@@ -10,9 +10,6 @@ module IceCube
     attr_reader :start_time
     deprecated_alias :start_date, :start_time
 
-    # Get the duration
-    attr_accessor :duration
-
     # Get the end time
     attr_reader :end_time
     deprecated_alias :end_date, :end_time
@@ -20,8 +17,8 @@ module IceCube
     # Create a new schedule
     def initialize(start_time = nil, options = {})
       self.start_time = start_time || TimeUtil.now
-      self.end_time = options[:end_time]
-      @duration = options[:duration]
+      self.end_time = self.start_time + options[:duration] if options[:duration]
+      self.end_time = options[:end_time] if options[:end_time]
       @all_recurrence_rules = []
       @all_exception_rules = []
     end
@@ -38,6 +35,14 @@ module IceCube
     end
     deprecated_alias :end_date=, :end_time=
 
+    def duration
+      end_time ? end_time - start_time : 0
+    end
+
+    def duration=(seconds)
+      @end_time = start_time + seconds
+    end
+
     # Add a recurrence time to the schedule
     def add_recurrence_time(time)
       return nil if time.nil?
@@ -156,19 +161,19 @@ module IceCube
 
     # The next n occurrences after now
     def next_occurrences(num, from = nil)
-      from ||= TimeUtil.now(@start_time.utc?)
+      from ||= TimeUtil.now(@start_time)
       find_occurrences(from + 1, nil, num)
     end
 
     # The next occurrence after now (overridable)
     def next_occurrence(from = nil)
-      from ||= TimeUtil.now(@start_time.utc?)
+      from ||= TimeUtil.now(@start_time)
       find_occurrences(from + 1, nil, 1).first
     end
 
     # The remaining occurrences (same requirements as all_occurrences)
     def remaining_occurrences(from = nil)
-      from ||= TimeUtil.now(@start_time.utc?)
+      from ||= TimeUtil.now(@start_time)
       find_occurrences(from)
     end
 
@@ -186,21 +191,20 @@ module IceCube
     # Return a boolean indicating if an occurrence is occurring between
     # two times, inclusive
     def occurring_between?(begin_time, closing_time)
-      dur = duration || 0
-      occurs_between?(begin_time - dur + 1, closing_time + dur - 1)
+      occurs_between?(begin_time - duration + 1, closing_time + duration - 1)
     end
 
     # Return a boolean indicating if an occurrence falls on a certain date
     def occurs_on?(date)
       date = TimeUtil.ensure_date date
-      begin_time = TimeUtil.beginning_of_date(date)
-      closing_time = TimeUtil.end_of_date(date)
+      begin_time = TimeUtil.beginning_of_date(date, start_time)
+      closing_time = TimeUtil.end_of_date(date, start_time)
       occurs_between?(begin_time, closing_time)
     end
 
     # Determine if the schedule is occurring at a given time
     def occurring_at?(time)
-      if duration
+      if duration > 0
         return false if exception_time?(time)
         occurs_between?(time - duration + 1, time)
       else
@@ -237,7 +241,7 @@ module IceCube
       # Due to durations, we need to walk up to the end time, and verify in the
       # other direction
       if last_time
-        last_time = terminating_schedule.duration ? last_time + terminating_schedule.duration : last_time
+        last_time += terminating_schedule.duration
         other_schedule.each_occurrence do |time|
           break if time > last_time
           return true if terminating_schedule.occurring_at?(time)
@@ -273,7 +277,6 @@ module IceCube
     def to_ical(force_utc = false)
       pieces = []
       pieces << "DTSTART#{IcalBuilder.ical_format(start_time, force_utc)}"
-      pieces << "DURATION:#{IcalBuilder.ical_duration(duration)}" if duration
       pieces.concat recurrence_rules.map { |r| "RRULE:#{r.to_ical}" }
       pieces.concat exception_rules.map { |r| "EXRULE:#{r.to_ical}" }
       pieces.concat recurrence_times.map { |t| "RDATE#{IcalBuilder.ical_format(t, force_utc)}" }
@@ -297,7 +300,6 @@ module IceCube
       data = {}
       data[:start_date] = TimeUtil.serialize_time(start_time)
       data[:end_time] = TimeUtil.serialize_time(end_time) if end_time
-      data[:duration] = duration if duration
       data[:rrules] = recurrence_rules.map(&:to_hash)
       data[:exrules] = exception_rules.map(&:to_hash)
       data[:rtimes] = recurrence_times.map do |rt|
@@ -315,7 +317,7 @@ module IceCube
       # And then deserialize
       data = IceCube::FlexibleHash.new(original_hash)
       schedule = IceCube::Schedule.new TimeUtil.deserialize_time(data[:start_date])
-      schedule.duration = data[:duration] if data[:duration]
+      schedule.end_time = schedule.start_time + data[:duration] if data[:duration]
       schedule.end_time = TimeUtil.deserialize_time(data[:end_time]) if data[:end_time]
       data[:rrules] && data[:rrules].each { |h| schedule.rrule(IceCube::Rule.from_hash(h)) }
       data[:exrules] && data[:exrules].each { |h| schedule.exrule(IceCube::Rule.from_hash(h)) }
@@ -362,6 +364,7 @@ module IceCube
     def find_occurrences(opening_time, closing_time = nil, limit = nil, &block)
       opening_time = TimeUtil.ensure_time opening_time
       closing_time = TimeUtil.ensure_time closing_time
+      opening_time += start_time.subsec - opening_time.subsec rescue 0
       reset
       answers = []
       opening_time = start_time if opening_time < start_time

data/lib/ice_cube/single_occurrence_rule.rb

@@ -15,7 +15,7 @@ module IceCube
 
     def next_time(t, schedule, closing_time)
       unless closing_time && closing_time < t
-        time if time >= t
+        time if time.to_i >= t.to_i
       end
     end
 

data/lib/ice_cube/time_util.rb

@@ -18,11 +18,23 @@ module IceCube
       :november => 11, :december => 12
     }
 
-    # Provides a Time.now without the usec
-    def self.now(utc = false)
-      time = Time.at(Time.now.to_i)
-      time = time.utc if utc
-      time
+    # Provides a Time.now without the usec, in the reference zone or utc offset
+    def self.now(reference=Time.now)
+      match_zone(Time.at(Time.now.to_i), reference)
+    end
+
+    def self.match_zone(time, reference)
+      if reference.respond_to? :time_zone
+        time.in_time_zone(reference.time_zone)
+      else
+        if reference.utc?
+          time.utc
+        elsif reference.zone
+          time.getlocal
+        else
+          time.getlocal(reference.utc_offset)
+        end
+      end
     end
 
     # Ensure that this is either nil, or a time
@@ -38,7 +50,9 @@ module IceCube
     def self.ensure_date(date)
       case date
       when Date then date
-      else date.to_time
+      else
+        return date.to_date if date.respond_to? :to_date
+        return date.to_time.to_date if date.respond_to? :to_time
       end
     end
 
@@ -61,17 +75,23 @@ module IceCube
     end
 
     # Get the beginning of a date
-    def self.beginning_of_date(date)
-      date.respond_to?(:beginning_of_day) ?
-        date.beginning_of_day :
-        Time.local(date.year, date.month, date.day, 0, 0, 0)
+    def self.beginning_of_date(date, reference=Time.now)
+      args = [date.year, date.month, date.day, 0, 0, 0]
+      if reference.respond_to?(:time_zone) && reference.time_zone
+        reference.time_zone.local(*args)
+      else
+        match_zone(Time.new(*args << reference.utc_offset), reference)
+      end
     end
 
     # Get the end of a date
-    def self.end_of_date(date)
-      date.respond_to?(:end_of_day) ?
-        date.end_of_day :
-        Time.local(date.year, date.month, date.day, 23, 59, 59)
+    def self.end_of_date(date, reference=Time.now)
+      args = [date.year, date.month, date.day, 23, 59, 59]
+      if reference.respond_to?(:time_zone) && reference.time_zone
+        reference.time_zone.local(*args)
+      else
+        match_zone(Time.new(*args << reference.utc_offset), reference)
+      end
     end
 
     # Convert a symbol to a numeric month

data/lib/ice_cube/validated_rule.rb

@@ -24,7 +24,7 @@ module IceCube
 
       until finds_acceptable_time?
         # Prevent a non-matching infinite loop
-        return nil if closing_time && @time > closing_time
+        return nil if closing_time && @time.to_i > closing_time.to_i
       end
 
       # NOTE Uses may be 1 higher than proper here since end_time isn't

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-01-03 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