ice_cube 0.7.2 → 0.7.3

data/lib/ice_cube/schedule.rb

@@ -218,7 +218,7 @@ module IceCube
 
     # Convert the schedule to yaml
     def to_yaml(*args)
-      defined?(Psych) ? Psych::dump(to_hash) : YAML::dump(to_hash, *args)
+      defined?(Psych) ? Psych::dump(to_hash, *args) : YAML::dump(to_hash, *args)
     end
 
     # Load the schedule from yaml

data/lib/ice_cube/validations/hourly_interval.rb

@@ -37,7 +37,10 @@ module IceCube
       end
 
       def validate(time, schedule)
-        hours = (time.to_i - schedule.start_time.to_i) / IceCube::ONE_HOUR
+        start_time = schedule.start_time
+        sec = (time.to_i - time.to_i % ONE_HOUR) - 
+          (start_time.to_i - start_time.to_i % ONE_HOUR)
+        hours = sec / ONE_HOUR
         unless hours % interval == 0
           interval - (hours % interval)
         end

data/lib/ice_cube/validations/minutely_interval.rb

@@ -37,7 +37,10 @@ module IceCube
       end
 
       def validate(time, schedule)
-        minutes = (time.to_i - schedule.start_time.to_i) / IceCube::ONE_MINUTE
+        start_time = schedule.start_time
+        sec = (time.to_i - time.to_i % ONE_MINUTE) -
+          (start_time.to_i - start_time.to_i % ONE_MINUTE)
+        minutes = sec / ONE_MINUTE
         unless minutes % interval == 0
           interval - (minutes % interval)
         end

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287244744060 !ruby/object:Gem::Requirement
+  requirement: &70170849596680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287244744060
+  version_requirements: *70170849596680
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70287244742720 !ruby/object:Gem::Requirement
+  requirement: &70170849596140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70287244742720
+  version_requirements: *70170849596140
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70287244741720 !ruby/object:Gem::Requirement
+  requirement: &70170849595700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287244741720
+  version_requirements: *70170849595700
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com