ice_cube 0.7.4 → 0.7.5

data/lib/ice_cube/rule.rb

@@ -68,6 +68,11 @@ module IceCube
       next_time(time, schedule, time) == time
     end
 
+    # Whether this rule requires a full run
+    def full_required?
+      !@count.nil?
+    end
+
     # Convenience methods for creating Rules
     class << self
 

data/lib/ice_cube/schedule.rb

@@ -276,17 +276,21 @@ module IceCube
       answers = []
       # ensure the bounds are proper
       if end_time
-        closing_time = end_time unless closing_time && closing_time < @end_time
+        closing_time = end_time unless closing_time && closing_time < end_time
       end
       opening_time = start_time if opening_time < start_time
-      # And off we go
-      time = opening_time
+      # walk up to the opening time - and off we go
+      # If we have rules with counts, we need to walk from the beginning of time,
+      # otherwise opening_time
+      time = full_required? ? start_time : opening_time
       loop do
         res = next_time(time, closing_time)
         break unless res
         break if closing_time && res > closing_time
-        block_given? ? block.call(res) : (answers << res)
-        break if limit && answers.length == limit
+        if res >= opening_time
+          block_given? ? block.call(res) : (answers << res)
+          break if limit && answers.length == limit
+        end
         time = res + 1
       end
       # and return our answers
@@ -324,6 +328,12 @@ module IceCube
       min_time
     end
 
+    # Return a boolean indicating if any rule needs to be run from the start of time
+    def full_required?
+      @all_recurrence_rules.any?(&:full_required?) ||
+      @all_exception_rules.any?(&:full_required?)
+    end
+
     # Return a boolean indicating whether or not a specific time
     # is excluded from the schedule
     def exception_time?(time)

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 -05:00
-default_executable: 
+date: 2011-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109986640720 !ruby/object:Gem::Requirement
+  requirement: &70240051831480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109986640720
+  version_requirements: *70240051831480
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70109986640220 !ruby/object:Gem::Requirement
+  requirement: &70240051830160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70109986640220
+  version_requirements: *70240051830160
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70109986639480 !ruby/object:Gem::Requirement
+  requirement: &70240051829120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109986639480
+  version_requirements: *70240051829120
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com
@@ -91,7 +90,6 @@ files:
 - lib/ice_cube/version.rb
 - lib/ice_cube.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://seejohnrun.github.com/ice_cube/
 licenses: []
 post_install_message: 
@@ -112,7 +110,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