ice_cube 0.3.2 → 0.3.3

data/lib/ice_cube/schedule.rb

@@ -15,11 +15,11 @@ module IceCube
     # Convert the schedule to a hash, reverse of Schedule.from_hash
     def to_hash
       hash = Hash.new
-      hash[:start_date] = @start_date
+      hash[:start_date] = TimeUtil.serializable_time(@start_date)
       hash[:rrules] = @rrule_occurrence_heads.map { |rr| rr.rule.to_hash }
       hash[:exrules] = @exrule_occurrence_heads.map { |ex| ex.rule.to_hash }
-      hash[:rdates] = @rdates
-      hash[:exdates] = @exdates
+      hash[:rdates] = @rdates.map { |t| TimeUtil.serializable_time(t) }
+      hash[:exdates] = @exdates.map { |t| TimeUtil.serializable_time(t) }
       hash
     end
 
@@ -132,7 +132,7 @@ module IceCube
       @exdates << date unless date.nil?
     end
    
-    attr_reader :rdates, :exdates
+    attr_reader :rdates, :exdates, :start_date
 
     def occurrences_between(begin_time, end_time)
       exclude_dates, include_dates = Set.new(@exdates), SortedSet.new(@rdates)

data/lib/ice_cube/time_util.rb

@@ -3,6 +3,19 @@ module TimeUtil
   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
+      time
+    end
+  end
+  
   def self.is_leap?(date)
     (date.year % 4 == 0 && date.year % 100 != 0) || (date.year % 400 == 0)
   end
@@ -15,4 +28,4 @@ module TimeUtil
     is_leap?(date) ? LeapYearMonthDays[date.month - 1] : CommonYearMonthDays[date.month - 1]
   end
   
-end
+end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - John Crepezzi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -04:00
+date: 2010-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency