chronic 0.2.2 → 0.10.2

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, options = {})
+      super
+      @current_fortnight_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      unless @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 = Chronic.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 = Chronic.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
+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, options = {})
+      super
+      @current_hour_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      unless @current_hour_start
+        case pointer
+        when :future
+          @current_hour_start = Chronic.construct(@now.year, @now.month, @now.day, @now.hour + 1)
+        when :past
+          @current_hour_start = Chronic.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 = Chronic.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+        hour_end = Chronic.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 = Chronic.construct(@now.year, @now.month, @now.day, @now.hour)
+        hour_end = Chronic.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      when :none
+        hour_start = Chronic.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
+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, options = {})
+      super
+      @current_minute_start = nil
+    end
+
+    def next(pointer = :future)
+      super
+
+      unless @current_minute_start
+        case pointer
+        when :future
+          @current_minute_start = Chronic.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+        when :past
+          @current_minute_start = Chronic.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 = Chronic.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 = Chronic.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+        minute_end = @now
+      when :none
+        minute_begin = Chronic.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+        minute_end = Chronic.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
+end

data/lib/chronic/repeaters/repeater_month.rb

@@ -1,61 +1,80 @@
-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)
-    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)
-    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
-    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'
+module Chronic
+  class RepeaterMonth < Repeater #:nodoc:
+    MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
+    YEAR_MONTHS = 12
+    MONTH_DAYS = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+    MONTH_DAYS_LEAP = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
+    def initialize(type, options = {})
+      super
+      @current_month_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      unless @current_month_start
+        @current_month_start = offset_by(Chronic.construct(@now.year, @now.month), 1, pointer)
+      else
+        @current_month_start = offset_by(Chronic.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
+      end
+
+      Span.new(@current_month_start, Chronic.construct(@current_month_start.year, @current_month_start.month + 1))
+    end
+
+    def this(pointer = :future)
+      super
+
+      case pointer
+      when :future
+        month_start = Chronic.construct(@now.year, @now.month, @now.day + 1)
+        month_end = self.offset_by(Chronic.construct(@now.year, @now.month), 1, :future)
+      when :past
+        month_start = Chronic.construct(@now.year, @now.month)
+        month_end = Chronic.construct(@now.year, @now.month, @now.day)
+      when :none
+        month_start = Chronic.construct(@now.year, @now.month)
+        month_end = self.offset_by(Chronic.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
+
+      days = month_days(new_year, new_month)
+      new_day = time.day > days ? days : time.day
+
+      Chronic.construct(new_year, new_month, new_day, time.hour, time.min, time.sec)
+    end
+
+    def width
+      MONTH_SECONDS
+    end
+
+    def to_s
+      super << '-month'
+    end
+
+    private
+
+    def month_days(year, month)
+      ::Date.leap?(year) ? MONTH_DAYS_LEAP[month - 1] : MONTH_DAYS[month - 1]
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -1,93 +1,95 @@
-class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
-  MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
-  
-  def next(pointer)
-    super
-    
-    if !@current_month_begin
-      target_month = symbol_to_number(@type)
-      case pointer
-      when :future
-        if @now.month < target_month
-          @current_month_begin = Time.construct(@now.year, target_month)
-        else @now.month > target_month
-          @current_month_begin = Time.construct(@now.year + 1, target_month)
-        end
-      when :none
-        if @now.month <= target_month
-          @current_month_begin = Time.construct(@now.year, target_month)
-        else @now.month > target_month
-          @current_month_begin = Time.construct(@now.year + 1, target_month)
+module Chronic
+  class RepeaterMonthName < Repeater #:nodoc:
+    MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
+    MONTHS = {
+      :january => 1,
+      :february => 2,
+      :march => 3,
+      :april => 4,
+      :may => 5,
+      :june => 6,
+      :july => 7,
+      :august => 8,
+      :september => 9,
+      :october => 10,
+      :november => 11,
+      :december => 12
+    }
+
+    def initialize(type, options = {})
+      super
+      @current_month_begin = nil
+    end
+
+    def next(pointer)
+      super
+
+      unless @current_month_begin
+        case pointer
+        when :future
+          if @now.month < index
+            @current_month_begin = Chronic.construct(@now.year, index)
+          elsif @now.month > index
+            @current_month_begin = Chronic.construct(@now.year + 1, index)
+          end
+        when :none
+          if @now.month <= index
+            @current_month_begin = Chronic.construct(@now.year, index)
+          elsif @now.month > index
+            @current_month_begin = Chronic.construct(@now.year + 1, index)
+          end
+        when :past
+          if @now.month >= index
+            @current_month_begin = Chronic.construct(@now.year, index)
+          elsif @now.month < index
+            @current_month_begin = Chronic.construct(@now.year - 1, index)
+          end
         end
-      when :past
-        if @now.month > target_month
-          @current_month_begin = Time.construct(@now.year, target_month)
-        else @now.month < target_month
-          @current_month_begin = Time.construct(@now.year - 1, target_month)
+        @current_month_begin || raise("Current month should be set by now")
+      else
+        case pointer
+        when :future
+          @current_month_begin = Chronic.construct(@current_month_begin.year + 1, @current_month_begin.month)
+        when :past
+          @current_month_begin = Chronic.construct(@current_month_begin.year - 1, @current_month_begin.month)
         end
       end
-      @current_month_begin || raise("Current month should be set by now")
-    else
+
+      cur_month_year = @current_month_begin.year
+      cur_month_month = @current_month_begin.month
+
+      if cur_month_month == 12
+        next_month_year = cur_month_year + 1
+        next_month_month = 1
+      else
+        next_month_year = cur_month_year
+        next_month_month = cur_month_month + 1
+      end
+
+      Span.new(@current_month_begin, Chronic.construct(next_month_year, next_month_month))
+    end
+
+    def this(pointer = :future)
+      super
+
       case pointer
-      when :future
-        @current_month_begin = Time.construct(@current_month_begin.year + 1, @current_month_begin.month)
       when :past
-        @current_month_begin = Time.construct(@current_month_begin.year - 1, @current_month_begin.month)
+        self.next(pointer)
+      when :future, :none
+        self.next(:none)
       end
     end
-    
-    cur_month_year = @current_month_begin.year
-    cur_month_month = @current_month_begin.month
-    
-    if cur_month_month == 12
-      next_month_year = cur_month_year + 1
-      next_month_month = 1
-    else
-      next_month_year = cur_month_year
-      next_month_month = cur_month_month + 1
+
+    def width
+      MONTH_SECONDS
     end
-      
-    Chronic::Span.new(@current_month_begin, Time.construct(next_month_year, next_month_month))
-  end
-  
-  def this(pointer = :future)
-    super
-    
-    case pointer
-    when :past
-      self.next(pointer)
-    when :future, :none
-      self.next(:none)
+
+    def index
+      @index ||= MONTHS[@type]
+    end
+
+    def to_s
+      super << '-monthname-' << @type.to_s
     end
   end
-  
-  def width
-    MONTH_SECONDS
-  end
-  
-  def index
-    symbol_to_number(@type)
-  end
-  
-  def to_s
-    super << '-monthname-' << @type.to_s
-  end
-  
-  private
-  
-  def symbol_to_number(sym)
-    lookup = {:january => 1,
-              :february => 2,
-              :march => 3,
-              :april => 4,
-              :may => 5,
-              :june => 6,
-              :july => 7,
-              :august => 8,
-              :september => 9,
-              :october => 10,
-              :november => 11,
-              :december => 12}
-    lookup[sym] || raise("Invalid symbol specified")
-  end
-end
+end