ice_cube 0.6.13 → 0.6.14

data/lib/ice_cube/rule_occurrence.rb

@@ -25,12 +25,11 @@ module IceCube
     end
 
     # Break after the first n occurrences after now
-    def next_occurrences(n, from)
+    def next_occurrences(n, from, exclude_dates)
       found_all = false
       num_found = 0
       nexts = find_occurrences do |roc|
-        find = roc > from
-        num_found += 1 if find
+        num_found += 1 if roc > from && !exclude_dates.include?(roc.to_time)
         success = found_all
         found_all = num_found == n
         success

data/lib/ice_cube/schedule.rb

@@ -159,7 +159,9 @@ module IceCube
     end
 
     def next_occurrences(n, from = Time.now)
-      nexts = find_occurrences { |head| head.next_occurrences(n, from) }
+      nexts = find_occurrences do |head, exclude_dates|
+        head.next_occurrences(n, from, exclude_dates)
+      end
       #Grabs the first n occurrences after the from date, remembering that there is still a
       #possibility that recurrence dates before the from time could be in the array
       nexts.select{|occurrence| occurrence > from}.first(n)
@@ -289,13 +291,13 @@ module IceCube
     # Use custom methods to say when to end
     def find_occurrences
       exclude_dates, include_dates = Set.new(@exdates), SortedSet.new(@rdates)
-      # walk through each rule, adding it to dates
-      @rrule_occurrence_heads.each do |rrule_occurrence_head|
-        include_dates.merge(yield(rrule_occurrence_head))
-      end
-      # walk through each exrule, removing it from dates
+      # walk through each exrule, adding it to the exclude dates
       @exrule_occurrence_heads.each do |exrule_occurrence_head|
         exclude_dates.merge(yield(exrule_occurrence_head))
+      end
+       # walk through each rule, adding it to dates
+      @rrule_occurrence_heads.each do |rrule_occurrence_head|
+        include_dates.merge(yield(rrule_occurrence_head, exclude_dates))
       end
       #return a unique list of dates
       include_dates.reject! { |date| exclude_dates.include?(date) }

data/lib/ice_cube/validations/day_of_week.rb

@@ -27,8 +27,11 @@ module IceCube
     def closest(date)
       return nil if !@days_of_week || @days_of_week.empty?
       goal = date
-      while goal += IceCube::ONE_DAY
-        return self.class.adjust(goal, date) if validate(goal)
+      while (next_date = goal + IceCube::ONE_DAY)
+        # DST hack.  If our day starts at midnight, when DST ends it will be pushed to 11 PM on the previous day.
+        check_date = next_date.day == goal.day ? next_date + IceCube::ONE_HOUR : next_date
+        return self.class.adjust(next_date, date) if validate(check_date)
+        goal = next_date
       end
     end
 

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.6.13'
+  VERSION = '0.6.14'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153777140 !ruby/object:Gem::Requirement
+  requirement: &70254752836240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153777140
+  version_requirements: *70254752836240
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com
@@ -53,7 +52,6 @@ files:
 - lib/ice_cube/validations/second_of_minute.rb
 - lib/ice_cube/version.rb
 - lib/ice_cube.rb
-has_rdoc: true
 homepage: http://seejohnrun.github.com/ice_cube/
 licenses: []
 post_install_message: 
@@ -74,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ice-cube
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Date Recurrence Library