ice_cube 0.5.9 → 0.6.0

data/lib/ice_cube/rule_occurrence.rb

@@ -25,6 +25,17 @@ module IceCube
       find_occurrences { |roc| roc > end_date }
     end
 
+    # Break after the first occurrence after now
+    def next_occurrence(from)
+      found_one = false
+      find_occurrences do |roc| 
+        find = roc > from
+        success = found_one
+        found_one = find
+        success
+      end
+    end
+
     def first(n)
       count = 0
       find_occurrences { |roc| count += 1; count > n }

data/lib/ice_cube/schedule.rb

@@ -35,10 +35,10 @@ module IceCube
     # Convert the schedule to yaml, reverse of Schedule.from_yaml
     def to_yaml(options = {})
       hash = to_hash
-      hash[:start_date] = TimeUtil.serializable_time(hash[:start_date])
-      hash[:rdates] = hash[:rdates].map { |t| TimeUtil.serializable_time(t) }
-      hash[:exdates] = hash[:exdates].map { |t| TimeUtil.serializable_time(t) }
-      hash[:end_time] = TimeUtil.serializable_time(hash[:end_time])
+      hash[:start_date] = TimeUtil.serialize_time(hash[:start_date])
+      hash[:rdates] = hash[:rdates].map { |t| TimeUtil.serialize_time(t) }
+      hash[:exdates] = hash[:exdates].map { |t| TimeUtil.serialize_time(t) }
+      hash[:end_time] = TimeUtil.serialize_time(hash[:end_time])
       hash.to_yaml(options)
     end
 
@@ -46,12 +46,12 @@ module IceCube
     def self.from_hash(hash)
       options = {}
       options[:duration] = hash[:duration] if hash.has_key?(:duration)
-      options[:end_time] = hash[:end_time] if hash.has_key?(:end_time)
-      schedule = Schedule.new(hash[:start_date], options)
+      options[:end_time] = TimeUtil.deserialize_time(hash[:end_time]) if hash.has_key?(:end_time)
+      schedule = Schedule.new(TimeUtil.deserialize_time(hash[:start_date]), options)
       hash[:rrules].each { |rr| schedule.add_recurrence_rule Rule.from_hash(rr) }
       hash[:exrules].each { |ex| schedule.add_exception_rule Rule.from_hash(ex) }
-      hash[:rdates].each { |rd| schedule.add_recurrence_date rd }
-      hash[:exdates].each { |ed| schedule.add_exception_date ed }
+      hash[:rdates].each { |rd| schedule.add_recurrence_date TimeUtil.deserialize_time(rd) }
+      hash[:exdates].each { |ed| schedule.add_exception_date TimeUtil.deserialize_time(ed) }
       schedule
     end
 
@@ -132,7 +132,8 @@ module IceCube
     
     # Find next scheduled occurrence
     def next_occurrence(from = Time.now)
-      remaining_occurrences(from).first
+      nexts = find_occurrences { |head| head.next_occurrence(from) }
+      nexts.empty? ? nil : (nexts.last if nexts.last > from)
     end
 
     # Retrieve the first (n) occurrences of the schedule.  May return less than

data/lib/ice_cube/time_util.rb

@@ -5,19 +5,21 @@ module IceCube
     LeapYearMonthDays	=	[31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     CommonYearMonthDays	=	[31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     
-    # this method exists because ActiveSupport will serialize
-    # TimeWithZone's in collections in UTC time instead of
-    # their local time.  if +time+ is a TimeWithZone, we move
-    # it to a DateTime
-    # Note: When converting to datetime, you microseconds get set to 0
-    def self.serializable_time(time)
-      if time.respond_to?(:to_datetime)
-        time.to_datetime
-      else
+    def self.serialize_time(time)
+      if time.is_a?(ActiveSupport::TimeWithZone)
+        { :time => time, :zone => time.time_zone }
+      elsif time.is_a?(Time)
         time
       end
     end
     
+    def self.deserialize_time(time_or_hash) 
+      return time_or_hash if time_or_hash.is_a?(Time) # for backward-compat
+      if time_or_hash.is_a?(Hash)
+        time_or_hash[:time].in_time_zone(time_or_hash[:zone])
+      end
+    end
+
     # TODO can we improve this more?
     def self.date_in_n_months(date, month_distance)
       

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.5.9'
+  VERSION = '0.6.0'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ice_cube
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 -04:00
+date: 2010-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency