chronic 0.3.0 → 0.4.0

data/lib/chronic/repeaters/repeater_day.rb

@@ -1,52 +1,54 @@
-class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
-  DAY_SECONDS = 86_400 # (24 * 60 * 60)
+module Chronic
+  class RepeaterDay < Repeater #:nodoc:
+    DAY_SECONDS = 86_400 # (24 * 60 * 60)
 
-  def initialize(type)
-    super
-    @current_day_start = nil
-  end
-
-  def next(pointer)
-    super
-
-    if !@current_day_start
-      @current_day_start = Chronic.time_class.local(@now.year, @now.month, @now.day)
+    def initialize(type)
+      super
+      @current_day_start = nil
     end
 
-    direction = pointer == :future ? 1 : -1
-    @current_day_start += direction * DAY_SECONDS
+    def next(pointer)
+      super
 
-    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
-  end
+      if !@current_day_start
+        @current_day_start = Chronic.time_class.local(@now.year, @now.month, @now.day)
+      end
+
+      direction = pointer == :future ? 1 : -1
+      @current_day_start += direction * DAY_SECONDS
 
-  def this(pointer = :future)
-    super
-
-    case pointer
-    when :future
-      day_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
-      day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
-    when :past
-      day_begin = Time.construct(@now.year, @now.month, @now.day)
-      day_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
-    when :none
-      day_begin = Time.construct(@now.year, @now.month, @now.day)
-      day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
+      Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
     end
 
-    Chronic::Span.new(day_begin, day_end)
-  end
+    def this(pointer = :future)
+      super
+
+      case pointer
+      when :future
+        day_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+        day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
+      when :past
+        day_begin = Time.construct(@now.year, @now.month, @now.day)
+        day_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+      when :none
+        day_begin = Time.construct(@now.year, @now.month, @now.day)
+        day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
+      end
+
+      Span.new(day_begin, day_end)
+    end
 
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * DAY_SECONDS
-  end
+    def offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
+      span + direction * amount * DAY_SECONDS
+    end
 
-  def width
-    DAY_SECONDS
-  end
+    def width
+      DAY_SECONDS
+    end
 
-  def to_s
-    super << '-day'
+    def to_s
+      super << '-day'
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -1,51 +1,53 @@
-class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
-  DAY_SECONDS = 86400 # (24 * 60 * 60)
+module Chronic
+  class RepeaterDayName < Repeater #:nodoc:
+    DAY_SECONDS = 86400 # (24 * 60 * 60)
 
-  def initialize(type)
-    super
-    @current_day_start = nil
-  end
+    def initialize(type)
+      super
+      @current_day_start = nil
+    end
 
-  def next(pointer)
-    super
+    def next(pointer)
+      super
 
-    direction = pointer == :future ? 1 : -1
+      direction = pointer == :future ? 1 : -1
 
-    if !@current_day_start
-      @current_day_start = Time.construct(@now.year, @now.month, @now.day)
-      @current_day_start += direction * DAY_SECONDS
+      if !@current_date
+        @current_date = Date.new(@now.year, @now.month, @now.day)
+        @current_date += direction
 
-      day_num = symbol_to_number(@type)
+        day_num = symbol_to_number(@type)
 
-      while @current_day_start.wday != day_num
-        @current_day_start += direction * DAY_SECONDS
+        while @current_date.wday != day_num
+          @current_date += direction
+        end
+      else
+        @current_date += direction * 7
       end
-    else
-      @current_day_start += direction * 7 * DAY_SECONDS
+      next_date = @current_date.succ
+      Span.new(Time.construct(@current_date.year, @current_date.month, @current_date.day), Time.construct(next_date.year, next_date.month, next_date.day))
     end
 
-    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
-  end
-
-  def this(pointer = :future)
-    super
+    def this(pointer = :future)
+      super
 
-    pointer = :future if pointer == :none
-    self.next(pointer)
-  end
+      pointer = :future if pointer == :none
+      self.next(pointer)
+    end
 
-  def width
-    DAY_SECONDS
-  end
+    def width
+      DAY_SECONDS
+    end
 
-  def to_s
-    super << '-dayname-' << @type.to_s
-  end
+    def to_s
+      super << '-dayname-' << @type.to_s
+    end
 
-  private
+    private
 
-  def symbol_to_number(sym)
-    lookup = {:sunday => 0, :monday => 1, :tuesday => 2, :wednesday => 3, :thursday => 4, :friday => 5, :saturday => 6}
-    lookup[sym] || raise("Invalid symbol specified")
+    def symbol_to_number(sym)
+      lookup = {:sunday => 0, :monday => 1, :tuesday => 2, :wednesday => 3, :thursday => 4, :friday => 5, :saturday => 6}
+      lookup[sym] || raise("Invalid symbol specified")
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -1,94 +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
+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
+    def initialize(type)
+      super
+      @current_span = nil
 
-    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")
+      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
+    def next(pointer)
+      super
 
-    full_day = 60 * 60 * 24
+      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
+      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
     end
-  end
 
-  def this(context = :future)
-    super
+    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
+      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) * Chronic::RepeaterDay::DAY_SECONDS)
-  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
+    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 to_s
-    super << '-dayportion-' << @type.to_s
+    def to_s
+      super << '-dayportion-' << @type.to_s
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -1,70 +1,72 @@
-class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
-  FORTNIGHT_SECONDS = 1_209_600 # (14 * 24 * 60 * 60)
+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 initialize(type)
+      super
+      @current_fortnight_start = nil
+    end
+
+    def next(pointer)
+      super
 
-  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
 
-    if !@current_fortnight_start
       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
-      direction = pointer == :future ? 1 : -1
-      @current_fortnight_start += direction * 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 offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
+      span + direction * amount * 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 width
+      FORTNIGHT_SECONDS
+    end
 
-  def to_s
-    super << '-fortnight'
+    def to_s
+      super << '-fortnight'
+    end
   end
-end
+end