hiccup 0.5.14 → 0.5.15

data/lib/hiccup/enumerable/monthly_date_enumerator.rb

@@ -4,11 +4,11 @@ module Hiccup
   module Enumerable
     class MonthlyDateEnumerator < MonthlyEnumerator
     protected
-      
+
       def occurrences_in_month(year, month)
         monthly_pattern
       end
-      
+
     end
   end
 end

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -3,7 +3,7 @@ require 'hiccup/enumerable/schedule_enumerator'
 module Hiccup
   module Enumerable
     class MonthlyEnumerator < ScheduleEnumerator
-      
+
       def self.for(schedule)
         if schedule.monthly_pattern.empty?
           NeverEnumerator
@@ -13,45 +13,45 @@ module Hiccup
           self
         end
       end
-      
-      
-      
+
+
+
       def started?
         !@position.nil?
       end
-      
-      
-      
+
+
+
     protected
-      
+
       attr_reader :year, :month, :cycle, :last_day_of_month
-      
-      
-      
+
+
+
       def advance!
         @position += 1
         next_month if @position >= cycle.length
-        
+
         day = cycle[@position]
         return self.next if day > last_day_of_month
         Date.new(year, month, day)
       rescue
         advance!
       end
-      
+
       def rewind!
         @position -= 1
         prev_month if @position < 0
-        
+
         day = cycle[@position]
         return self.prev if day > last_day_of_month
         Date.new(year, month, day)
       rescue
         rewind!
       end
-      
-      
-      
+
+
+
       def first_occurrence_on_or_after(date)
         @year, @month, seed_day = date.year, date.month, date.day
         if skip > 1
@@ -62,19 +62,19 @@ module Hiccup
             seed_day = first_day_of_month
           end
         end
-        
+
         get_context
-        
+
         @position = cycle.index { |day| day >= seed_day }
         next_month unless @position
-        
+
         day = cycle[@position]
         return self.next if day > last_day_of_month
         Date.new(year, month, day)
       rescue
         advance!
       end
-      
+
       def first_occurrence_on_or_before(date)
         @year, @month, seed_day = date.year, date.month, date.day
         if skip > 1
@@ -86,21 +86,21 @@ module Hiccup
             seed_day = last_day_of_month
           end
         end
-        
+
         get_context
-        
+
         @position = cycle.rindex { |day| day <= seed_day }
         prev_month unless @position
-        
+
         day = cycle[@position]
         return self.prev if day > last_day_of_month
         Date.new(year, month, day)
       rescue
         rewind!
       end
-      
-      
-      
+
+
+
       def occurrences_in_month(year, month)
         wday_of_first_of_month = Date.new(year, month, 1).wday
         monthly_pattern.map do |occurrence|
@@ -117,48 +117,48 @@ module Hiccup
           end
         end
       end
-      
-      
-      
+
+
+
       def next_month
         @position = 0
         add_to_months skip
         get_context
       end
-      
+
       def add_to_months(offset)
         @month += offset
         @year, @month = @year + 1, @month - 12 while @month > 12
       end
-      
+
       def prev_month
         @position = @cycle.length - 1
         subtract_from_months skip
         get_context
       end
-      
+
       def subtract_from_months(offset)
         @month -= offset
         @year, @month = @year - 1, @month + 12 while @month < 1
       end
-      
+
       def get_context
         @last_day_of_month = [4, 6, 9, 11].member?(month) ? 30 : 31
         @last_day_of_month = leap_year?(year) ? 29 : 28 if month == 2
         @cycle = occurrences_in_month(year, month).sort
       end
-      
-      
-      
+
+
+
       def months_since_schedule_start(year, month)
         (year - start_date.year) * 12 + (month - start_date.month)
       end
-      
+
       def first_day_of_month
         1
       end
-      
-      
+
+
     end
   end
 end

data/lib/hiccup/enumerable/never_enumerator.rb

@@ -3,26 +3,26 @@ require 'hiccup/enumerable/schedule_enumerator'
 module Hiccup
   module Enumerable
     class NeverEnumerator < ScheduleEnumerator
-      
-      
+
+
       def next
         @cursor = @cursor ? nil : first_occurrence_on_or_after(seed_date)
       end
-      
+
       def prev
         @cursor = @cursor ? nil : first_occurrence_on_or_before(seed_date)
       end
-      
-      
+
+
       def first_occurrence_on_or_after(date)
         start_date if date <= start_date
       end
-      
+
       def first_occurrence_on_or_before(date)
         start_date unless date < start_date
       end
-      
-      
+
+
     end
   end
 end

data/lib/hiccup/enumerable/schedule_enumerator.rb

@@ -1,7 +1,7 @@
 module Hiccup
   module Enumerable
     class ScheduleEnumerator
-      
+
       def self.enum_for(schedule)
         case schedule.kind
         when :weekly then WeeklyEnumerator
@@ -10,9 +10,9 @@ module Hiccup
         else NeverEnumerator
         end
       end
-      
-      
-      
+
+
+
       def initialize(schedule, seed_date)
         @schedule = schedule
         @ends = schedule.ends?
@@ -20,95 +20,95 @@ module Hiccup
         @seed_date = seed_date.to_date if seed_date.respond_to?(:to_date)
         @cursor = nil
       end
-      
+
       attr_reader :schedule, :seed_date, :cursor
-      
-      
-      
+
+
+
       def next
         @cursor = started? ? advance! : first_occurrence_on_or_after(seed_start_date)
         return nil if @cursor && ends? && @cursor > end_date
         @cursor
       end
-      
+
       def prev
         @cursor = started? ? rewind! : first_occurrence_on_or_before(seed_end_date)
         return nil if @cursor && @cursor < start_date
         @cursor
       end
-      
-      
-      
+
+
+
       def started?
         !@cursor.nil?
       end
-      
+
       def ends?
         @ends
       end
-      
-      
-      
+
+
+
     protected
-      
-      
-      
+
+
+
       delegate :start_date, :weekly_pattern, :monthly_pattern, :end_date, :skip, :to => :schedule
-      
-      
-      
+
+
+
       def leap_year?(year)
         return false unless (year % 4).zero?
         return (year % 400).zero? if (year % 100).zero?
         true
       end
-      
-      
-      
+
+
+
       def seed_start_date
         return start_date if (seed_date < start_date)
         seed_date
       end
-      
+
       def seed_end_date
         return end_date if (ends? && seed_date > end_date)
         seed_date
       end
-      
-      
-      
+
+
+
       # These two methods DO assume that
       # date is predicted by the given schedule
       # Subclasses can probably supply more
       # performant implementations of these.
-      
+
       def advance!
         puts "calling ScheduleEnumerator#advance! slow!"
         first_occurrence_on_or_after(cursor + 1)
       end
-      
+
       def rewind!
         puts "calling ScheduleEnumerator#rewind! slow!"
         first_occurrence_on_or_before(cursor - 1)
       end
-      
-      
-      
+
+
+
       # These two methods DO NOT assume that
       # date is predicted by the given schedule
       # Subclasses _must_ provide implementations
       # of these methods.
-      
+
       def first_occurrence_on_or_after(date)
         raise NotImplementedError
       end
-      
+
       def first_occurrence_on_or_before(date)
         raise NotImplementedError
       end
-      
-      
-      
+
+
+
     end
   end
 end

data/lib/hiccup/enumerable/weekly_enumerator.rb

@@ -3,57 +3,57 @@ require 'hiccup/enumerable/schedule_enumerator'
 module Hiccup
   module Enumerable
     class WeeklyEnumerator < ScheduleEnumerator
-      
+
       def initialize(*args)
         super
-        
+
         @wday_pattern = weekly_pattern.map do |weekday|
           Date::DAYNAMES.index(weekday)
         end.sort
-        
+
         if @wday_pattern.empty?
           @base_date = start_date
           @starting_index = 0
           @cycle = []
           return
         end
-        
+
         start_wday = start_date.wday
         if start_wday <= @wday_pattern.first or start_wday > @wday_pattern.last
           @base_date = start_date
         else
           @base_date = start_date - (start_wday - @wday_pattern.first)
         end
-        
+
         @starting_index = wday_pattern.index { |wday| wday >= start_wday } || 0
         @cycle = calculate_cycle(schedule)
       end
-      
+
     protected
-      
-      
-      
+
+
+
       attr_reader :base_date,
                   :wday_pattern,
                   :starting_index,
                   :cycle,
                   :position
-      
-      
-      
+
+
+
       def advance!
         date = cursor + cycle[position]
         @position = (position + 1) % cycle.length
         date
       end
-      
+
       def rewind!
         @position = position <= 0 ? cycle.length - 1 : position - 1
         cursor - cycle[position]
       end
-      
-      
-      
+
+
+
       def first_occurrence_on_or_after(date)
         result = nil
         wday = date.wday
@@ -61,16 +61,16 @@ module Hiccup
           wd = wd + 7 if wd < wday
           days_in_the_future = wd - wday
           temp = date + days_in_the_future
-          
+
           remainder = ((temp - base_date) / 7).to_i % skip
           temp += (skip - remainder) * 7 if remainder > 0
-          
+
           result = temp if !result || (temp < result)
         end
         @position = position_of(result) if result
         result
       end
-      
+
       def first_occurrence_on_or_before(date)
         result = nil
         wday = date.wday
@@ -78,43 +78,43 @@ module Hiccup
           wd = wd - 7 if wd > wday
           days_in_the_past = wday - wd
           temp = date - days_in_the_past
-          
+
           remainder = ((temp - base_date) / 7).to_i % skip
           temp -= remainder * 7 if remainder > 0
-          
+
           result = temp if !result || (temp > result)
         end
         @position = position_of(result) if result
         result
       end
-      
-      
-      
+
+
+
       def calculate_cycle(schedule)
         cycle = []
         offset = wday_pattern[starting_index]
         wdays = wday_pattern.map { |wday| wday - offset }.sort
-        
+
         while wdays.first <= 0
           wdays.push (wdays.shift + 7 * skip)
         end
-        
+
         cycle = [wdays.first]
         wdays.each_cons(2) do |wday1, wday2|
           cycle << (wday2 - wday1)
         end
         cycle
       end
-      
+
       def position_of(date)
         date_i = wday_pattern.index(date.wday)
         position = date_i - starting_index
         position += wday_pattern.length if position < 0
         position
       end
-      
-      
-      
+
+
+
     end
   end
 end