ice_cube 0.6.3 → 0.6.4

data/lib/ice_cube/rule_occurrence.rb

@@ -27,13 +27,23 @@ module IceCube
 
     # Break after the first occurrence after now
     def next_occurrence(from)
-      found_one = false
-      find_occurrences do |roc| 
+      next_occurrences(1, from).first
+    end
+
+    # Break after the first n occurrences after now
+    def next_occurrences(n, from)
+      found_all = false
+      num_found = 0
+      nexts = find_occurrences do |roc|
         find = roc > from
-        success = found_one
-        found_one = find
+        num_found += 1 if find
+        success = found_all
+        found_all = num_found == n
         success
       end
+      #Since the above returns all up to and including the next N that were requested, we need
+      #to grab the last n, making sure to prune out ones that were actually before the from time
+      nexts.last(n).select{|occurrence| occurrence > from}
     end
 
     def first(n)

data/lib/ice_cube/schedule.rb

@@ -135,8 +135,14 @@ module IceCube
     
     # Find next scheduled occurrence
     def next_occurrence(from = Time.now)
-      nexts = find_occurrences { |head| head.next_occurrence(from) }
-      nexts.empty? ? nil : (nexts.last if nexts.last > from)
+      next_occurrences(1, from).first
+    end
+
+    def next_occurrences(n, from = Time.now)
+      nexts = find_occurrences { |head| head.next_occurrences(n, from) }
+      #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)
     end
 
     # Retrieve the first (n) occurrences of the schedule.  May return less than

data/lib/ice_cube/version.rb

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

metadata

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