ice_cube 0.4.5 → 0.5.0

data/lib/ice_cube/rule.rb

@@ -90,7 +90,7 @@ module IceCube
       end
     end
     
-    # The key - extremely educated guesses
+    # The key to speed - extremely educated guesses
     # This spidering behavior will go through look for the next suggestion
     # by constantly moving the farthest back value forward
     def next_suggestion(date)
@@ -100,13 +100,13 @@ module IceCube
       compact_suggestions = suggestions.values.compact
       # find the next date to go to
       if compact_suggestions.empty?
-        next_date = date
+        attempt_count = 0
         loop do
           # keep going through rule suggestions
-          next_date = self.default_jump(next_date)
-          return next_date if validate_single_date(next_date)
+          next_date = self.default_jump(date, attempt_count += 1)
+          return next_date if !next_date.nil? && validate_single_date(next_date)
         end
-      else  
+      else
         loop do
           compact_suggestions = suggestions.values.compact
           min_suggestion = compact_suggestions.min

data/lib/ice_cube/rule_occurrence.rb

@@ -41,12 +41,13 @@ module IceCube
       else
         date = @rule.next_suggestion(@date)
       end
-      #walk through all of the successive dates, looking for the next occurrence (interval-valid), then return it.
+      # walk through all of the successive dates, looking for the next occurrence (interval-valid), then return it.
       begin
-        return nil if yield(date)
         return nil if @end_time && date > @end_time
         return nil if @rule.until_date && date > @rule.until_date # until check
-        return RuleOccurrence.new(@rule, @start_date, @end_time, date, @index + 1) if @rule.in_interval?(date, @start_date)
+        next unless @rule.in_interval?(date, @start_date) 
+        return nil if yield(date)
+        return RuleOccurrence.new(@rule, @start_date, @end_time, date, @index + 1)
       end while date = @rule.next_suggestion(date)
     end
     

data/lib/ice_cube/rules/daily_rule.rb

@@ -21,7 +21,7 @@ module IceCube
         
     protected
     
-    def default_jump(date)
+    def default_jump(date, attempt_count = nil)
       goal = date + IceCube::ONE_DAY * @interval
       adjust(goal, date)
     end

data/lib/ice_cube/rules/hourly_rule.rb

@@ -19,7 +19,7 @@ module IceCube
         
     protected
     
-    def default_jump(date)
+    def default_jump(date, attempt_count = nil)
       date + IceCube::ONE_HOUR * @interval
     end
         

data/lib/ice_cube/rules/minutely_rule.rb

@@ -19,7 +19,7 @@ module IceCube
         
     protected
     
-    def default_jump(date)
+    def default_jump(date, attempt_count = nil)
       date + IceCube::ONE_MINUTE
     end
 

data/lib/ice_cube/rules/monthly_rule.rb

@@ -7,8 +7,8 @@ module IceCube
     # and either (1) we're on a valid day of the week (ie: first sunday of the month)
     # or we're on a valid day of the month (1, 15, -1)
     # Note: Rollover is not implemented, so the 35th day of the month is invalid.
-    def in_interval?(date, start_date) 
-      #make sure we're in the proper interval
+    def in_interval?(date, start_date)
+      # make sure we're in the proper interval
       months_to_start_date = (date.month - start_date.month) + (date.year - start_date.year) * 12
       months_to_start_date % @interval == 0
     end
@@ -23,12 +23,8 @@ module IceCube
     
     protected
     
-    def default_jump(date)
-      goal = date
-      @interval.times do
-        goal += TimeUtil.days_in_month(goal) * ONE_DAY
-      end
-      adjust(goal, date)
+    def default_jump(date, attempt_count = 1)
+      TimeUtil.date_in_n_months(date, attempt_count * @interval)
     end
  
     private

data/lib/ice_cube/rules/secondly_rule.rb

@@ -19,7 +19,7 @@ module IceCube
         
     protected
            
-    def default_jump(date)
+    def default_jump(date, attempt_count = nil)
       date + 1
     end
 

data/lib/ice_cube/rules/weekly_rule.rb

@@ -29,7 +29,7 @@ module IceCube
     
     protected
     
-    def default_jump(date)
+    def default_jump(date, attempt_count = nil)
       goal = date + 7 * IceCube::ONE_DAY * @interval
       adjust(goal, date)
     end

data/lib/ice_cube/rules/yearly_rule.rb

@@ -24,13 +24,9 @@ module IceCube
     protected
     
     # one year from now, the same month and day of the year
-    def default_jump(date)
-      #jump by months since there's no reliable way to jump by year
-      goal = date
-      (@interval * 12).times do
-        goal += TimeUtil.days_in_month(goal) * ONE_DAY
-      end
-      adjust(goal, date)
+    def default_jump(date, attempt_count = 1)
+      # jump by months since there's no reliable way to jump by year
+      TimeUtil.date_in_n_months(date, attempt_count * @interval * 12)
     end
     
     private

data/lib/ice_cube/schedule.rb

@@ -125,9 +125,9 @@ module IceCube
 
     # Retrieve the first (n) occurrences of the schedule.  May return less than
     # n results, if the rules end before n results are reached.
-    def first(n = 1)
-      dates = find_occurrences { |head| head.first(n) }
-      dates.slice(0, n)
+    def first(n = nil)
+      dates = find_occurrences { |head| head.first(n || 1) }
+      n.nil? ? dates.first : dates.slice(0, n)
     end
              
     # Add a rule of any type as an recurrence in this schedule

data/lib/ice_cube/time_util.rb

@@ -16,16 +16,56 @@ module TimeUtil
     end
   end
   
-  def self.is_leap?(date)
-    (date.year % 4 == 0 && date.year % 100 != 0) || (date.year % 400 == 0)
+  # TODO can we improve this more?
+  def self.date_in_n_months(date, month_distance)
+
+    next_mark = date
+    days_in_month_of_next_mark = days_in_month(next_mark)
+
+    month_distance.times do
+      
+      prev_mark = next_mark
+      next_mark += days_in_month_of_next_mark * ONE_DAY
+      
+      # only moving one day at a time, so this suffices
+      months_covered = next_mark.month - prev_mark.month
+      months_covered += 12 if months_covered < 0
+            
+      # step back to the end of the previous month of months_covered went too far
+      if months_covered == 2
+        next_mark -= next_mark.mday * ONE_DAY
+      end
+
+      days_in_month_of_next_mark = days_in_month(next_mark)
+      next_mark = adjust(next_mark, prev_mark)
+      
+    end
+
+    # at the end, there's a chance we're not on the correct day,
+    # but if we're not - we will always be behind it in the correct month
+    # if there exists no proper day in the month for us, return nil - otherwise, return that date
+
+    if days_in_month_of_next_mark >= date.mday
+      next_mark += (date.mday - next_mark.mday) * ONE_DAY
+    end
+    
+  end
+
+  def adjust(goal, date)
+    return goal if goal.utc_offset == date.utc_offset
+    goal - goal.utc_offset + date.utc_offset
+  end
+  
+  def self.is_leap?(year)
+    (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)
   end
 
   def self.days_in_year(date)
-    is_leap?(date) ? 366 : 365
+    is_leap?(date.year) ? 366 : 365
   end
 
   def self.days_in_month(date)
-    is_leap?(date) ? LeapYearMonthDays[date.month - 1] : CommonYearMonthDays[date.month - 1]
+    is_leap?(date.year) ? LeapYearMonthDays[date.month - 1] : CommonYearMonthDays[date.month - 1]
   end
 
   def self.ical_format(time)

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
   
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ice_cube
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
   - 5
-  version: 0.4.5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - John Crepezzi
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 -04:00
+date: 2010-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -71,23 +74,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ice-cube
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Date Recurrence Library