ice_cube 0.5.4 → 0.5.5

data/lib/ice_cube/schedule.rb

@@ -105,10 +105,10 @@ module IceCube
     end
     
     # Determine whether a given date appears in the times returned by the schedule
-    # Required activeSupport
     def occurs_on?(date)
-      time = date.to_time
-      occurrences_between(time.beginning_of_day, time.end_of_day).any?
+      return active_support_occurs_on?(date) if date.respond_to?(:to_time)
+      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
         
     # Return all possible occurrences 
@@ -184,7 +184,12 @@ module IceCube
 
     
     private
-
+      
+    def active_support_occurs_on?(date)
+      time = date.to_time
+      occurrences_between(time.beginning_of_day, time.end_of_day).any?
+    end
+        
     # tell if, from a list of rule_occurrence heads, a certain time is occurring
     def any_occurring_at?(what, time)
       return false if @start_time && time < @start_time

data/lib/ice_cube/validations/day_of_week.rb

@@ -35,7 +35,7 @@ module IceCube
       representation << 'on the '
       representation << @days_of_week.map do |day, occ| 
         self.class.nice_numbers(occ) << ' ' << Date::DAYNAMES[day] << (occ.size != 1 ? 's' : '') unless @days_of_week.empty?
-      end.join(' and the ')
+      end.join(' when it is the ')
       representation
     end
   

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 
 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
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -04:00
+date: 2010-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency