chronic 0.2.3 → 0.3.0

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -1,9 +1,14 @@
 class Chronic::RepeaterFortnight < Chronic::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
@@ -22,15 +27,15 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
       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
@@ -49,7 +54,7 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
       Chronic::Span.new(this_fortnight_start, this_fortnight_end)
     end
   end
-  
+
   def offset(span, amount, pointer)
     direction = pointer == :future ? 1 : -1
     span + direction * amount * FORTNIGHT_SECONDS
@@ -58,8 +63,8 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
   def width
     FORTNIGHT_SECONDS
   end
-  
+
   def to_s
     super << '-fortnight'
   end
-end
+end

data/lib/chronic/repeaters/repeater_hour.rb

@@ -1,9 +1,14 @@
 class Chronic::RepeaterHour < Chronic::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
@@ -15,13 +20,13 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
       direction = pointer == :future ? 1 : -1
       @current_hour_start += direction * 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)
@@ -33,20 +38,20 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
       hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
       hour_end = hour_begin + HOUR_SECONDS
     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,9 +1,14 @@
 class Chronic::RepeaterMinute < Chronic::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
@@ -15,13 +20,13 @@ class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
       direction = pointer == :future ? 1 : -1
       @current_minute_start += direction * 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
@@ -33,20 +38,20 @@ class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
       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
-    
+
     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,22 +1,27 @@
 class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
   MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
   YEAR_MONTHS = 12
-  
+
+  def initialize(type)
+    super
+    @current_month_start = nil
+  end
+
   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)
@@ -28,20 +33,20 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
       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)      
+
+  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) 
+
+  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
@@ -50,12 +55,12 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
     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
+end

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -1,28 +1,33 @@
 class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
   MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
-  
+
+  def initialize(type)
+    super
+    @current_month_begin = nil
+  end
+
   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
+        elsif @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
+        elsif @now.month > target_month
           @current_month_begin = Time.construct(@now.year + 1, target_month)
         end
       when :past
         if @now.month > target_month
           @current_month_begin = Time.construct(@now.year, target_month)
-        else @now.month < target_month
+        elsif @now.month < target_month
           @current_month_begin = Time.construct(@now.year - 1, target_month)
         end
       end
@@ -35,10 +40,10 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
         @current_month_begin = Time.construct(@current_month_begin.year - 1, @current_month_begin.month)
       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
@@ -46,13 +51,13 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
       next_month_year = cur_month_year
       next_month_month = cur_month_month + 1
     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)
@@ -60,21 +65,21 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
       self.next(:none)
     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,
@@ -90,4 +95,4 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
               :december => 12}
     lookup[sym] || raise("Invalid symbol specified")
   end
-end
+end

data/lib/chronic/repeaters/repeater_season.rb

@@ -1,23 +1,150 @@
+class Time
+  def to_minidate
+    MiniDate.new(self.month, self.day)
+  end
+end
+
+class Season
+  attr_reader :start, :end
+
+  def initialize(myStart, myEnd)
+    @start = myStart
+    @end = myEnd
+  end
+
+  def self.find_next_season(season, pointer)
+    lookup = {:spring => 0, :summer => 1, :autumn => 2, :winter => 3}
+    next_season_num = (lookup[season]+1*pointer) % 4
+    lookup.invert[next_season_num]
+  end
+
+  def self.season_after(season); find_next_season(season, +1); end
+  def self.season_before(season); find_next_season(season, -1); end
+end
+
+class MiniDate
+  attr_accessor :month, :day
+
+  def initialize(month, day)
+    @month = month
+    @day = day
+  end
+
+  def is_between?(md_start, md_end)
+    return true if (@month == md_start.month and @day >= md_start.day) ||
+                   (@month == md_end.month and @day <= md_end.day)
+
+    i = md_start.month + 1
+    until i == md_end.month
+      return true if @month == i
+      i = (i+1) % 12
+    end
+
+    return false
+  end
+
+  def equals?(other)
+    @month == other.month and day == other.day
+  end
+end
+
 class Chronic::RepeaterSeason < Chronic::Repeater #:nodoc:
+  YEAR_SEASONS = 4
   SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
-  
+  SEASONS = { :spring => Season.new( MiniDate.new(3,20),MiniDate.new(6,20) ),
+              :summer => Season.new( MiniDate.new(6,21),MiniDate.new(9,22) ),
+              :autumn => Season.new( MiniDate.new(9,23),MiniDate.new(12,21) ),
+              :winter => Season.new( MiniDate.new(12,22),MiniDate.new(3,19) ) }
+
+  def initialize(type)
+    super
+    @next_season_start = nil
+  end
+
   def next(pointer)
     super
-    
-    raise 'Not implemented'
+
+    direction = pointer == :future ? 1 : -1
+    next_season = Season.find_next_season(find_current_season(@now.to_minidate), direction)
+
+    find_next_season_span(direction, next_season)
   end
-  
+
   def this(pointer = :future)
     super
-    
-    raise 'Not implemented'
+
+    direction = pointer == :future ? 1 : -1
+
+    today = Time.construct(@now.year, @now.month, @now.day)
+    this_ssn = find_current_season(@now.to_minidate)
+    case pointer
+    when :past
+      this_ssn_start = today + direction * num_seconds_til_start(this_ssn, direction)
+      this_ssn_end = today
+    when :future
+      this_ssn_start = today + Chronic::RepeaterDay::DAY_SECONDS
+      this_ssn_end = today + direction * num_seconds_til_end(this_ssn, direction)
+    when :none
+      this_ssn_start = today + direction * num_seconds_til_start(this_ssn, direction)
+      this_ssn_end = today + direction * num_seconds_til_end(this_ssn, direction)
+    end
+
+    Chronic::Span.new(this_ssn_start, this_ssn_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
+    time + amount * direction * SEASON_SECONDS
+  end
+
   def width
     SEASON_SECONDS
   end
-  
+
   def to_s
     super << '-season'
   end
-end
+
+  private
+
+  def find_next_season_span(direction, next_season)
+    if !@next_season_start or !@next_season_end
+      @next_season_start = Time.construct(@now.year, @now.month, @now.day)
+      @next_season_end = Time.construct(@now.year, @now.month, @now.day)
+    end
+
+    @next_season_start += direction * num_seconds_til_start(next_season, direction)
+    @next_season_end += direction * num_seconds_til_end(next_season, direction)
+
+    Chronic::Span.new(@next_season_start, @next_season_end)
+  end
+
+  def find_current_season(md)
+    [:spring, :summer, :autumn, :winter].each do |season|
+      return season if md.is_between?(SEASONS[season].start, SEASONS[season].end)
+    end
+  end
+
+  def num_seconds_til(goal, direction)
+    start = Time.construct(@now.year, @now.month, @now.day)
+    seconds = 0
+
+    until (start + direction * seconds).to_minidate.equals?(goal)
+      seconds += Chronic::RepeaterDay::DAY_SECONDS
+    end
+
+    seconds
+  end
+
+  def num_seconds_til_start(season_symbol, direction)
+    num_seconds_til(SEASONS[season_symbol].start, direction)
+  end
+
+  def num_seconds_til_end(season_symbol, direction)
+    num_seconds_til(SEASONS[season_symbol].end, direction)
+  end
+end