chronic 0.2.3 → 0.4.0

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -1,93 +1,95 @@
-class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
-  @@morning = (6 * 60 * 60)..(12 * 60 * 60) # 6am-12am
-  @@afternoon = (13 * 60 * 60)..(17 * 60 * 60) # 1pm-5pm
-  @@evening = (17 * 60 * 60)..(20 * 60 * 60) # 5pm-8pm
-  @@night = (20 * 60 * 60)..(24 * 60 * 60) # 8pm-12pm
-  
-  def initialize(type)
-    super
-    
-    if type.kind_of? Integer
-      @range = (@type * 60 * 60)..((@type + 12) * 60 * 60)
-    else
-      lookup = {:am => 0..(12 * 60 * 60 - 1),
-                :pm => (12 * 60 * 60)..(24 * 60 * 60 - 1),
-                :morning => @@morning,
-                :afternoon => @@afternoon,
-                :evening => @@evening,
-                :night => @@night}
-      @range = lookup[type]
-      lookup[type] || raise("Invalid type '#{type}' for RepeaterDayPortion")
+module Chronic
+  class RepeaterDayPortion < Repeater #:nodoc:
+    PORTIONS = {
+      :am => 0..(12 * 60 * 60 - 1),
+      :pm => (12 * 60 * 60)..(24 * 60 * 60 - 1),
+      :morning => (6 * 60 * 60)..(12 * 60 * 60),   # 6am-12am,
+      :afternoon =>(13 * 60 * 60)..(17 * 60 * 60), # 1pm-5pm,
+      :evening => (17 * 60 * 60)..(20 * 60 * 60),  # 5pm-8pm,
+      :night =>(20 * 60 * 60)..(24 * 60 * 60),     # 8pm-12pm
+    }
+
+    def initialize(type)
+      super
+      @current_span = nil
+
+      if type.kind_of? Integer
+        @range = (@type * 60 * 60)..((@type + 12) * 60 * 60)
+      else
+        @range = PORTIONS[type]
+        @range || raise("Invalid type '#{type}' for RepeaterDayPortion")
+      end
+
+      @range || raise("Range should have been set by now")
     end
-    @range || raise("Range should have been set by now")
-  end
-  
-  def next(pointer)
-    super
-    
-    full_day = 60 * 60 * 24
-    
-    if !@current_span
-      now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
-      if now_seconds < @range.begin
-        case pointer
-        when :future
-          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
-        when :past
-          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
-        end
-      elsif now_seconds > @range.end
-        case pointer
-        when :future
-          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
-        when :past
-          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+
+    def next(pointer)
+      super
+
+      full_day = 60 * 60 * 24
+
+      if !@current_span
+        now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
+        if now_seconds < @range.begin
+          case pointer
+          when :future
+            range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+          when :past
+            range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
+          end
+        elsif now_seconds > @range.end
+          case pointer
+          when :future
+            range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
+          when :past
+            range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+          end
+        else
+          case pointer
+          when :future
+            range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
+          when :past
+            range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
+          end
         end
+
+        @current_span = Span.new(range_start, range_start + (@range.end - @range.begin))
       else
         case pointer
         when :future
-          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
+          @current_span += full_day
         when :past
-          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
+          @current_span -= full_day
         end
       end
-      
-      @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
-    else
-      case pointer
-      when :future
-        @current_span += full_day
-      when :past
-        @current_span -= full_day
+    end
+
+    def this(context = :future)
+      super
+
+      range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+      @current_span = Span.new(range_start, range_start + (@range.end - @range.begin))
+    end
+
+    def offset(span, amount, pointer)
+      @now = span.begin
+      portion_span = self.next(pointer)
+      direction = pointer == :future ? 1 : -1
+      portion_span + (direction * (amount - 1) * RepeaterDay::DAY_SECONDS)
+    end
+
+    def width
+      @range || raise("Range has not been set")
+      return @current_span.width if @current_span
+      if @type.kind_of? Integer
+        return (12 * 60 * 60)
+      else
+        @range.end - @range.begin
       end
     end
-  end
-  
-  def this(context = :future)
-    super
-    
-    range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
-    @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
-  end
-  
-  def offset(span, amount, pointer)
-    @now = span.begin
-    portion_span = self.next(pointer)
-    direction = pointer == :future ? 1 : -1
-    portion_span + (direction * (amount - 1) * Chronic::RepeaterDay::DAY_SECONDS)
-  end
-  
-  def width
-    @range || raise("Range has not been set")
-    return @current_span.width if @current_span
-    if @type.kind_of? Integer
-      return (12 * 60 * 60)
-    else
-      @range.end - @range.begin
+
+    def to_s
+      super << '-dayportion-' << @type.to_s
     end
   end
-  
-  def to_s
-    super << '-dayportion-' << @type.to_s
-  end
 end

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -1,65 +1,72 @@
-class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
-  FORTNIGHT_SECONDS = 1_209_600 # (14 * 24 * 60 * 60)
-  
-  def next(pointer)
-    super
-    
-    if !@current_fortnight_start
+module Chronic
+  class RepeaterFortnight < Repeater #:nodoc:
+    FORTNIGHT_SECONDS = 1_209_600 # (14 * 24 * 60 * 60)
+
+    def initialize(type)
+      super
+      @current_fortnight_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      if !@current_fortnight_start
+        case pointer
+        when :future
+          sunday_repeater = RepeaterDayName.new(:sunday)
+          sunday_repeater.start = @now
+          next_sunday_span = sunday_repeater.next(:future)
+          @current_fortnight_start = next_sunday_span.begin
+        when :past
+          sunday_repeater = RepeaterDayName.new(:sunday)
+          sunday_repeater.start = (@now + RepeaterDay::DAY_SECONDS)
+          2.times { sunday_repeater.next(:past) }
+          last_sunday_span = sunday_repeater.next(:past)
+          @current_fortnight_start = last_sunday_span.begin
+        end
+      else
+        direction = pointer == :future ? 1 : -1
+        @current_fortnight_start += direction * FORTNIGHT_SECONDS
+      end
+
+      Span.new(@current_fortnight_start, @current_fortnight_start + FORTNIGHT_SECONDS)
+    end
+
+    def this(pointer = :future)
+      super
+
+      pointer = :future if pointer == :none
+
       case pointer
       when :future
-        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+        this_fortnight_start = Time.construct(@now.year, @now.month, @now.day, @now.hour) + RepeaterHour::HOUR_SECONDS
+        sunday_repeater = RepeaterDayName.new(:sunday)
         sunday_repeater.start = @now
-        next_sunday_span = sunday_repeater.next(:future)
-        @current_fortnight_start = next_sunday_span.begin
+        sunday_repeater.this(:future)
+        this_sunday_span = sunday_repeater.this(:future)
+        this_fortnight_end = this_sunday_span.begin
+        Span.new(this_fortnight_start, this_fortnight_end)
       when :past
-        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-        sunday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
-        2.times { sunday_repeater.next(:past) }
+        this_fortnight_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+        sunday_repeater = RepeaterDayName.new(:sunday)
+        sunday_repeater.start = @now
         last_sunday_span = sunday_repeater.next(:past)
-        @current_fortnight_start = last_sunday_span.begin
+        this_fortnight_start = last_sunday_span.begin
+        Span.new(this_fortnight_start, this_fortnight_end)
       end
-    else
+    end
+
+    def offset(span, amount, pointer)
       direction = pointer == :future ? 1 : -1
-      @current_fortnight_start += direction * FORTNIGHT_SECONDS
+      span + direction * amount * FORTNIGHT_SECONDS
     end
-    
-    Chronic::Span.new(@current_fortnight_start, @current_fortnight_start + FORTNIGHT_SECONDS)
-  end
-  
-  def this(pointer = :future)
-    super
-    
-    pointer = :future if pointer == :none
-    
-    case pointer
-    when :future
-      this_fortnight_start = Time.construct(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
-      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-      sunday_repeater.start = @now
-      sunday_repeater.this(:future)
-      this_sunday_span = sunday_repeater.this(:future)
-      this_fortnight_end = this_sunday_span.begin
-      Chronic::Span.new(this_fortnight_start, this_fortnight_end)
-    when :past
-      this_fortnight_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
-      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-      sunday_repeater.start = @now
-      last_sunday_span = sunday_repeater.next(:past)
-      this_fortnight_start = last_sunday_span.begin
-      Chronic::Span.new(this_fortnight_start, this_fortnight_end)
+
+    def width
+      FORTNIGHT_SECONDS
     end
-  end
-  
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * FORTNIGHT_SECONDS
-  end
 
-  def width
-    FORTNIGHT_SECONDS
-  end
-  
-  def to_s
-    super << '-fortnight'
+    def to_s
+      super << '-fortnight'
+    end
   end
 end

data/lib/chronic/repeaters/repeater_hour.rb

@@ -1,52 +1,59 @@
-class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
-  HOUR_SECONDS = 3600 # 60 * 60
-  
-  def next(pointer)
-    super
-    
-    if !@current_hour_start
+module Chronic
+  class RepeaterHour < Repeater #:nodoc:
+    HOUR_SECONDS = 3600 # 60 * 60
+
+    def initialize(type)
+      super
+      @current_hour_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      if !@current_hour_start
+        case pointer
+        when :future
+          @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
+        when :past
+          @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour - 1)
+        end
+      else
+        direction = pointer == :future ? 1 : -1
+        @current_hour_start += direction * HOUR_SECONDS
+      end
+
+      Span.new(@current_hour_start, @current_hour_start + HOUR_SECONDS)
+    end
+
+    def this(pointer = :future)
+      super
+
       case pointer
       when :future
-        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
+        hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+        hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
       when :past
-        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour - 1)
+        hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+        hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      when :none
+        hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+        hour_end = hour_start + HOUR_SECONDS
       end
-    else
+
+      Span.new(hour_start, hour_end)
+    end
+
+    def offset(span, amount, pointer)
       direction = pointer == :future ? 1 : -1
-      @current_hour_start += direction * HOUR_SECONDS
+      span + direction * amount * HOUR_SECONDS
     end
-    
-    Chronic::Span.new(@current_hour_start, @current_hour_start + HOUR_SECONDS)
-  end
-  
-  def this(pointer = :future)
-    super
-    
-    case pointer
-    when :future
-      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
-      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
-    when :past
-      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
-      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-    when :none
-      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
-      hour_end = hour_begin + HOUR_SECONDS
+
+    def width
+      HOUR_SECONDS
+    end
+
+    def to_s
+      super << '-hour'
     end
-    
-    Chronic::Span.new(hour_start, hour_end)
-  end
-  
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * HOUR_SECONDS
-  end
-  
-  def width
-    HOUR_SECONDS
-  end
-  
-  def to_s
-    super << '-hour'
   end
 end

data/lib/chronic/repeaters/repeater_minute.rb

@@ -1,52 +1,59 @@
-class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
-  MINUTE_SECONDS = 60
-  
-  def next(pointer = :future)
-    super
-    
-    if !@current_minute_start
+module Chronic
+  class RepeaterMinute < Repeater #:nodoc:
+    MINUTE_SECONDS = 60
+
+    def initialize(type)
+      super
+      @current_minute_start = nil
+    end
+
+    def next(pointer = :future)
+      super
+
+      if !@current_minute_start
+        case pointer
+        when :future
+          @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+        when :past
+          @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min - 1)
+        end
+      else
+        direction = pointer == :future ? 1 : -1
+        @current_minute_start += direction * MINUTE_SECONDS
+      end
+
+      Span.new(@current_minute_start, @current_minute_start + MINUTE_SECONDS)
+    end
+
+    def this(pointer = :future)
+      super
+
       case pointer
       when :future
-        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+        minute_begin = @now
+        minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
       when :past
-        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min - 1)
+        minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+        minute_end = @now
+      when :none
+        minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+        minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
       end
-    else
+
+      Span.new(minute_begin, minute_end)
+    end
+
+    def offset(span, amount, pointer)
       direction = pointer == :future ? 1 : -1
-      @current_minute_start += direction * MINUTE_SECONDS
+      span + direction * amount * MINUTE_SECONDS
     end
-    
-    Chronic::Span.new(@current_minute_start, @current_minute_start + MINUTE_SECONDS)
-  end
-  
-  def this(pointer = :future)
-    super
-    
-    case pointer
-    when :future
-      minute_begin = @now
-      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-    when :past
-      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-      minute_end = @now
-    when :none
-      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
+
+    def width
+      MINUTE_SECONDS
+    end
+
+    def to_s
+      super << '-minute'
     end
-    
-    Chronic::Span.new(minute_begin, minute_end)
-  end
-  
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * MINUTE_SECONDS
-  end
-  
-  def width
-    MINUTE_SECONDS
-  end
-  
-  def to_s
-    super << '-minute'
   end
 end

data/lib/chronic/repeaters/repeater_month.rb

@@ -1,61 +1,68 @@
-class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
-  MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
-  YEAR_MONTHS = 12
-  
-  def next(pointer)
-    super
-    
-    if !@current_month_start
-      @current_month_start = offset_by(Time.construct(@now.year, @now.month), 1, pointer)
-    else
-      @current_month_start = offset_by(Time.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
+module Chronic
+  class RepeaterMonth < Repeater #:nodoc:
+    MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
+    YEAR_MONTHS = 12
+
+    def initialize(type)
+      super
+      @current_month_start = nil
     end
-    
-    Chronic::Span.new(@current_month_start, Time.construct(@current_month_start.year, @current_month_start.month + 1))
-  end
-  
-  def this(pointer = :future)
-    super
-    
-    case pointer
-    when :future
-      month_start = Time.construct(@now.year, @now.month, @now.day + 1)
-      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
-    when :past
-      month_start = Time.construct(@now.year, @now.month)
-      month_end = Time.construct(@now.year, @now.month, @now.day)
-    when :none
-      month_start = Time.construct(@now.year, @now.month)
-      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
+
+    def next(pointer)
+      super
+
+      if !@current_month_start
+        @current_month_start = offset_by(Time.construct(@now.year, @now.month), 1, pointer)
+      else
+        @current_month_start = offset_by(Time.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
+      end
+
+      Span.new(@current_month_start, Time.construct(@current_month_start.year, @current_month_start.month + 1))
     end
-    
-    Chronic::Span.new(month_start, month_end)
-  end
-  
-  def offset(span, amount, pointer)      
-    Chronic::Span.new(offset_by(span.begin, amount, pointer), offset_by(span.end, amount, pointer))
-  end
-  
-  def offset_by(time, amount, pointer) 
-    direction = pointer == :future ? 1 : -1
-    
-    amount_years = direction * amount / YEAR_MONTHS
-    amount_months = direction * amount % YEAR_MONTHS
-    
-    new_year = time.year + amount_years
-    new_month = time.month + amount_months
-    if new_month > YEAR_MONTHS
-      new_year += 1
-      new_month -= YEAR_MONTHS
+
+    def this(pointer = :future)
+      super
+
+      case pointer
+      when :future
+        month_start = Time.construct(@now.year, @now.month, @now.day + 1)
+        month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
+      when :past
+        month_start = Time.construct(@now.year, @now.month)
+        month_end = Time.construct(@now.year, @now.month, @now.day)
+      when :none
+        month_start = Time.construct(@now.year, @now.month)
+        month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
+      end
+
+      Span.new(month_start, month_end)
+    end
+
+    def offset(span, amount, pointer)
+      Span.new(offset_by(span.begin, amount, pointer), offset_by(span.end, amount, pointer))
+    end
+
+    def offset_by(time, amount, pointer)
+      direction = pointer == :future ? 1 : -1
+
+      amount_years = direction * amount / YEAR_MONTHS
+      amount_months = direction * amount % YEAR_MONTHS
+
+      new_year = time.year + amount_years
+      new_month = time.month + amount_months
+      if new_month > YEAR_MONTHS
+        new_year += 1
+        new_month -= YEAR_MONTHS
+      end
+      Time.construct(new_year, new_month, time.day, time.hour, time.min, time.sec)
+    end
+
+    def width
+      MONTH_SECONDS
+    end
+
+    def to_s
+      super << '-month'
     end
-    Time.construct(new_year, new_month, time.day, time.hour, time.min, time.sec)
-  end
-  
-  def width
-    MONTH_SECONDS
-  end
-  
-  def to_s
-    super << '-month'
   end
 end