chronic 0.3.0 → 0.4.0

data/lib/chronic/repeaters/repeater_week.rb

@@ -1,73 +1,75 @@
-class Chronic::RepeaterWeek < Chronic::Repeater #:nodoc:
-  WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
+module Chronic
+  class RepeaterWeek < Repeater #:nodoc:
+    WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
 
-  def initialize(type)
-    super
-    @current_week_start = nil
-  end
+    def initialize(type)
+      super
+      @current_week_start = nil
+    end
+
+    def next(pointer)
+      super
 
-  def next(pointer)
-    super
+      if !@current_week_start
+        case pointer
+        when :future
+          sunday_repeater = RepeaterDayName.new(:sunday)
+          sunday_repeater.start = @now
+          next_sunday_span = sunday_repeater.next(:future)
+          @current_week_start = next_sunday_span.begin
+        when :past
+          sunday_repeater = RepeaterDayName.new(:sunday)
+          sunday_repeater.start = (@now + RepeaterDay::DAY_SECONDS)
+          sunday_repeater.next(:past)
+          last_sunday_span = sunday_repeater.next(:past)
+          @current_week_start = last_sunday_span.begin
+        end
+      else
+        direction = pointer == :future ? 1 : -1
+        @current_week_start += direction * WEEK_SECONDS
+      end
+
+      Span.new(@current_week_start, @current_week_start + WEEK_SECONDS)
+    end
+
+    def this(pointer = :future)
+      super
 
-    if !@current_week_start
       case pointer
       when :future
-        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+        this_week_start = Chronic.time_class.local(@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_week_start = next_sunday_span.begin
+        this_sunday_span = sunday_repeater.this(:future)
+        this_week_end = this_sunday_span.begin
+        Span.new(this_week_start, this_week_end)
       when :past
-        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-        sunday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
-        sunday_repeater.next(:past)
+        this_week_end = Chronic.time_class.local(@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_week_start = last_sunday_span.begin
+        this_week_start = last_sunday_span.begin
+        Span.new(this_week_start, this_week_end)
+      when :none
+        sunday_repeater = RepeaterDayName.new(:sunday)
+        sunday_repeater.start = @now
+        last_sunday_span = sunday_repeater.next(:past)
+        this_week_start = last_sunday_span.begin
+        Span.new(this_week_start, this_week_start + WEEK_SECONDS)
       end
-    else
-      direction = pointer == :future ? 1 : -1
-      @current_week_start += direction * WEEK_SECONDS
     end
 
-    Chronic::Span.new(@current_week_start, @current_week_start + WEEK_SECONDS)
-  end
-
-  def this(pointer = :future)
-    super
-
-    case pointer
-    when :future
-      this_week_start = Chronic.time_class.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
-      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-      sunday_repeater.start = @now
-      this_sunday_span = sunday_repeater.this(:future)
-      this_week_end = this_sunday_span.begin
-      Chronic::Span.new(this_week_start, this_week_end)
-    when :past
-      this_week_end = Chronic.time_class.local(@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_week_start = last_sunday_span.begin
-      Chronic::Span.new(this_week_start, this_week_end)
-    when :none
-      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-      sunday_repeater.start = @now
-      last_sunday_span = sunday_repeater.next(:past)
-      this_week_start = last_sunday_span.begin
-      Chronic::Span.new(this_week_start, this_week_start + WEEK_SECONDS)
+    def offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
+      span + direction * amount * WEEK_SECONDS
     end
-  end
 
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * WEEK_SECONDS
-  end
-
-  def width
-    WEEK_SECONDS
-  end
+    def width
+      WEEK_SECONDS
+    end
 
-  def to_s
-    super << '-week'
+    def to_s
+      super << '-week'
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_weekday.rb

@@ -1,77 +1,86 @@
-class Chronic::RepeaterWeekday < Chronic::Repeater #:nodoc:
-  WEEK_WEEKDAYS = 5
-  DAY_SECONDS = 86400 # (24 * 60 * 60)
-
-  def initialize(type)
-    super
-    @current_weekday_start = nil
-  end
-
-  def next(pointer)
-    super
+module Chronic
+  class RepeaterWeekday < Repeater #:nodoc:
+    DAY_SECONDS = 86400 # (24 * 60 * 60)
+    DAYS = {
+      :sunday => 0,
+      :monday => 1,
+      :tuesday => 2,
+      :wednesday => 3,
+      :thursday => 4,
+      :friday => 5,
+      :saturday => 6
+    }
+
+    def initialize(type)
+      super
+      @current_weekday_start = nil
+    end
 
-    direction = pointer == :future ? 1 : -1
+    def next(pointer)
+      super
 
-    if !@current_weekday_start
-      @current_weekday_start = Time.construct(@now.year, @now.month, @now.day)
-      @current_weekday_start += direction * DAY_SECONDS
+      direction = pointer == :future ? 1 : -1
 
-      until is_weekday?(@current_weekday_start.wday)
+      if !@current_weekday_start
+        @current_weekday_start = Time.construct(@now.year, @now.month, @now.day)
         @current_weekday_start += direction * DAY_SECONDS
+
+        until is_weekday?(@current_weekday_start.wday)
+          @current_weekday_start += direction * DAY_SECONDS
+        end
+      else
+        loop do
+          @current_weekday_start += direction * DAY_SECONDS
+          break if is_weekday?(@current_weekday_start.wday)
+        end
       end
-    else
-      loop do
-        @current_weekday_start += direction * DAY_SECONDS
-        break if is_weekday?(@current_weekday_start.wday)
-      end
-    end
 
-    Chronic::Span.new(@current_weekday_start, @current_weekday_start + DAY_SECONDS)
-  end
+      Span.new(@current_weekday_start, @current_weekday_start + DAY_SECONDS)
+    end
 
-  def this(pointer = :future)
-    super
+    def this(pointer = :future)
+      super
 
-    case pointer
-    when :past
-      self.next(:past)
-    when :future, :none
-      self.next(:future)
+      case pointer
+      when :past
+        self.next(:past)
+      when :future, :none
+        self.next(:future)
+      end
     end
-  end
 
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
+    def offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
 
-    num_weekdays_passed = 0; offset = 0
-    until num_weekdays_passed == amount
-      offset += direction * DAY_SECONDS
-      num_weekdays_passed += 1 if is_weekday?((span.begin+offset).wday)
-    end
+      num_weekdays_passed = 0; offset = 0
+      until num_weekdays_passed == amount
+        offset += direction * DAY_SECONDS
+        num_weekdays_passed += 1 if is_weekday?((span.begin+offset).wday)
+      end
 
-    span + offset
-  end
+      span + offset
+    end
 
-  def width
-    DAY_SECONDS
-  end
+    def width
+      DAY_SECONDS
+    end
 
-  def to_s
-    super << '-weekday'
-  end
+    def to_s
+      super << '-weekday'
+    end
 
-  private
+    private
 
-  def is_weekend?(day)
-    day == symbol_to_number(:saturday) || day == symbol_to_number(:sunday)
-  end
+    def is_weekend?(day)
+      day == symbol_to_number(:saturday) || day == symbol_to_number(:sunday)
+    end
 
-  def is_weekday?(day)
-    !is_weekend?(day)
-  end
+    def is_weekday?(day)
+      !is_weekend?(day)
+    end
 
-  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)
+      DAYS[sym] || raise("Invalid symbol specified")
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_weekend.rb

@@ -1,65 +1,67 @@
-class Chronic::RepeaterWeekend < Chronic::Repeater #:nodoc:
-  WEEKEND_SECONDS = 172_800 # (2 * 24 * 60 * 60)
+module Chronic
+  class RepeaterWeekend < Repeater #:nodoc:
+    WEEKEND_SECONDS = 172_800 # (2 * 24 * 60 * 60)
 
-  def initialize(type)
-    super
-    @current_week_start = nil
-  end
+    def initialize(type)
+      super
+      @current_week_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      if !@current_week_start
+        case pointer
+        when :future
+          saturday_repeater = RepeaterDayName.new(:saturday)
+          saturday_repeater.start = @now
+          next_saturday_span = saturday_repeater.next(:future)
+          @current_week_start = next_saturday_span.begin
+        when :past
+          saturday_repeater = RepeaterDayName.new(:saturday)
+          saturday_repeater.start = (@now + RepeaterDay::DAY_SECONDS)
+          last_saturday_span = saturday_repeater.next(:past)
+          @current_week_start = last_saturday_span.begin
+        end
+      else
+        direction = pointer == :future ? 1 : -1
+        @current_week_start += direction * RepeaterWeek::WEEK_SECONDS
+      end
 
-  def next(pointer)
-    super
+      Span.new(@current_week_start, @current_week_start + WEEKEND_SECONDS)
+    end
+
+    def this(pointer = :future)
+      super
 
-    if !@current_week_start
       case pointer
-      when :future
-        saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+      when :future, :none
+        saturday_repeater = RepeaterDayName.new(:saturday)
         saturday_repeater.start = @now
-        next_saturday_span = saturday_repeater.next(:future)
-        @current_week_start = next_saturday_span.begin
+        this_saturday_span = saturday_repeater.this(:future)
+        Span.new(this_saturday_span.begin, this_saturday_span.begin + WEEKEND_SECONDS)
       when :past
-        saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
-        saturday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
-        last_saturday_span = saturday_repeater.next(:past)
-        @current_week_start = last_saturday_span.begin
+        saturday_repeater = RepeaterDayName.new(:saturday)
+        saturday_repeater.start = @now
+        last_saturday_span = saturday_repeater.this(:past)
+        Span.new(last_saturday_span.begin, last_saturday_span.begin + WEEKEND_SECONDS)
       end
-    else
-      direction = pointer == :future ? 1 : -1
-      @current_week_start += direction * Chronic::RepeaterWeek::WEEK_SECONDS
     end
 
-    Chronic::Span.new(@current_week_start, @current_week_start + WEEKEND_SECONDS)
-  end
-
-  def this(pointer = :future)
-    super
-
-    case pointer
-    when :future, :none
-      saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
-      saturday_repeater.start = @now
-      this_saturday_span = saturday_repeater.this(:future)
-      Chronic::Span.new(this_saturday_span.begin, this_saturday_span.begin + WEEKEND_SECONDS)
-    when :past
-      saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
-      saturday_repeater.start = @now
-      last_saturday_span = saturday_repeater.this(:past)
-      Chronic::Span.new(last_saturday_span.begin, last_saturday_span.begin + WEEKEND_SECONDS)
+    def offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
+      weekend = RepeaterWeekend.new(:weekend)
+      weekend.start = span.begin
+      start = weekend.next(pointer).begin + (amount - 1) * direction * RepeaterWeek::WEEK_SECONDS
+      Span.new(start, start + (span.end - span.begin))
     end
-  end
 
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    weekend = Chronic::RepeaterWeekend.new(:weekend)
-    weekend.start = span.begin
-    start = weekend.next(pointer).begin + (amount - 1) * direction * Chronic::RepeaterWeek::WEEK_SECONDS
-    Chronic::Span.new(start, start + (span.end - span.begin))
-  end
-
-  def width
-    WEEKEND_SECONDS
-  end
+    def width
+      WEEKEND_SECONDS
+    end
 
-  def to_s
-    super << '-weekend'
+    def to_s
+      super << '-weekend'
+    end
   end
-end
+end

data/lib/chronic/repeaters/repeater_year.rb

@@ -1,64 +1,66 @@
-class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
-  YEAR_SECONDS =  31536000  # 365 * 24 * 60 * 60
+module Chronic
+  class RepeaterYear < Repeater #:nodoc:
+    YEAR_SECONDS =  31536000  # 365 * 24 * 60 * 60
 
-  def initialize(type)
-    super
-    @current_year_start = nil
-  end
+    def initialize(type)
+      super
+      @current_year_start = nil
+    end
 
-  def next(pointer)
-    super
+    def next(pointer)
+      super
 
-    if !@current_year_start
-      case pointer
-      when :future
-        @current_year_start = Time.construct(@now.year + 1)
-      when :past
-        @current_year_start = Time.construct(@now.year - 1)
+      if !@current_year_start
+        case pointer
+        when :future
+          @current_year_start = Time.construct(@now.year + 1)
+        when :past
+          @current_year_start = Time.construct(@now.year - 1)
+        end
+      else
+        diff = pointer == :future ? 1 : -1
+        @current_year_start = Time.construct(@current_year_start.year + diff)
       end
-    else
-      diff = pointer == :future ? 1 : -1
-      @current_year_start = Time.construct(@current_year_start.year + diff)
+
+      Span.new(@current_year_start, Time.construct(@current_year_start.year + 1))
     end
 
-    Chronic::Span.new(@current_year_start, Time.construct(@current_year_start.year + 1))
-  end
+    def this(pointer = :future)
+      super
 
-  def this(pointer = :future)
-    super
+      case pointer
+      when :future
+        this_year_start = Time.construct(@now.year, @now.month, @now.day) + RepeaterDay::DAY_SECONDS
+        this_year_end = Time.construct(@now.year + 1, 1, 1)
+      when :past
+        this_year_start = Time.construct(@now.year, 1, 1)
+        this_year_end = Time.construct(@now.year, @now.month, @now.day)
+      when :none
+        this_year_start = Time.construct(@now.year, 1, 1)
+        this_year_end = Time.construct(@now.year + 1, 1, 1)
+      end
 
-    case pointer
-    when :future
-      this_year_start = Time.construct(@now.year, @now.month, @now.day) + Chronic::RepeaterDay::DAY_SECONDS
-      this_year_end = Time.construct(@now.year + 1, 1, 1)
-    when :past
-      this_year_start = Time.construct(@now.year, 1, 1)
-      this_year_end = Time.construct(@now.year, @now.month, @now.day)
-    when :none
-      this_year_start = Time.construct(@now.year, 1, 1)
-      this_year_end = Time.construct(@now.year + 1, 1, 1)
+      Span.new(this_year_start, this_year_end)
     end
 
-    Chronic::Span.new(this_year_start, this_year_end)
-  end
+    def offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
 
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
+      sb = span.begin
+      new_begin = Time.construct(sb.year + (amount * direction), sb.month, sb.day, sb.hour, sb.min, sb.sec)
 
-    sb = span.begin
-    new_begin = Time.construct(sb.year + (amount * direction), sb.month, sb.day, sb.hour, sb.min, sb.sec)
+      se = span.end
+      new_end = Time.construct(se.year + (amount * direction), se.month, se.day, se.hour, se.min, se.sec)
 
-    se = span.end
-    new_end = Time.construct(se.year + (amount * direction), se.month, se.day, se.hour, se.min, se.sec)
-
-    Chronic::Span.new(new_begin, new_end)
-  end
+      Span.new(new_begin, new_end)
+    end
 
-  def width
-    (365 * 24 * 60 * 60)
-  end
+    def width
+      (365 * 24 * 60 * 60)
+    end
 
-  def to_s
-    super << '-year'
+    def to_s
+      super << '-year'
+    end
   end
-end
+end