ice_cube 0.6.2 → 0.6.3

data/lib/ice_cube/schedule.rb

@@ -106,7 +106,10 @@ module IceCube
     
     # Determine whether a given date appears in the times returned by the schedule
     def occurs_on?(date)
-      return active_support_occurs_on?(date) if date.respond_to?(:to_time)
+      if defined?(ActiveSupport::TimeWithZone) && @start_date.is_a?(ActiveSupport::TimeWithZone)
+        return active_support_occurs_on?(date)
+      end
+      # fall back to our own way of doing things
       time_format = @start_date.utc? ? :utc : :local
       self.occurrences_between(Time.send(time_format, date.year, date.month, date.day, 0, 0, 0), Time.send(time_format, date.year, date.month, date.day, 23, 59, 59)).any?
     end
@@ -197,8 +200,10 @@ module IceCube
     
     private
       
+    # We know that start_date is a time with zone - so check referencing
+    # The date in that time zone
     def active_support_occurs_on?(date)
-      time = date.to_time
+      time = Time.zone.parse(date.to_s) # date.to_time.in_time_zone(@start_date.time_zone)
       occurrences_between(time.beginning_of_day, time.end_of_day).any?
     end
         

data/lib/ice_cube/time_util.rb

@@ -7,7 +7,7 @@ module IceCube
     
     def self.serialize_time(time)
       if time.is_a?(ActiveSupport::TimeWithZone)
-        { :time => time, :zone => time.time_zone.is_a?(ActiveSupport::TimeZone) ? time.time_zone.name : time.time_zone }
+        { :time => time, :zone => time.time_zone.name }
       elsif time.is_a?(Time)
         time
       end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ice_cube
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -04:00
+date: 2010-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency