chronic 0.2.2 → 0.10.2

data/lib/chronic/repeaters/repeater_season.rb

@@ -1,23 +1,111 @@
-class Chronic::RepeaterSeason < Chronic::Repeater #:nodoc:
-  SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
-  
-  def next(pointer)
-    super
-    
-    raise 'Not implemented'
+module Chronic
+  class RepeaterSeason < Repeater #:nodoc:
+    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, options = {})
+      super
+      @next_season_start = nil
+      @next_season_end = nil
+    end
+
+    def next(pointer)
+      super
+
+      direction = pointer == :future ? 1 : -1
+      next_season = Season.find_next_season(find_current_season(MiniDate.from_time(@now)), direction)
+
+      find_next_season_span(direction, next_season)
+    end
+
+    def this(pointer = :future)
+      super
+
+      direction = pointer == :future ? 1 : -1
+
+      today = Chronic.construct(@now.year, @now.month, @now.day)
+      this_ssn = find_current_season(MiniDate.from_time(@now))
+      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 + 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
+
+      construct_season(this_ssn_start, this_ssn_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
+      time + amount * direction * SEASON_SECONDS
+    end
+
+    def width
+      SEASON_SECONDS
+    end
+
+    def to_s
+      super << '-season'
+    end
+
+    private
+
+    def find_next_season_span(direction, next_season)
+      unless @next_season_start || @next_season_end
+        @next_season_start = Chronic.construct(@now.year, @now.month, @now.day)
+        @next_season_end = Chronic.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)
+
+      construct_season(@next_season_start, @next_season_end)
+    end
+
+    def find_current_season(md)
+      [:spring, :summer, :autumn, :winter].find do |season|
+        md.is_between?(SEASONS[season].start, SEASONS[season].end)
+      end
+    end
+
+    def num_seconds_til(goal, direction)
+      start = Chronic.construct(@now.year, @now.month, @now.day)
+      seconds = 0
+
+      until MiniDate.from_time(start + direction * seconds).equals?(goal)
+        seconds += 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
+
+    def construct_season(start, finish)
+      Span.new(
+        Chronic.construct(start.year, start.month, start.day),
+        Chronic.construct(finish.year, finish.month, finish.day)
+      )
+    end
   end
-  
-  def this(pointer = :future)
-    super
-    
-    raise 'Not implemented'
-  end
-  
-  def width
-    SEASON_SECONDS
-  end
-  
-  def to_s
-    super << '-season'
-  end
-end
+end

data/lib/chronic/repeaters/repeater_season_name.rb

@@ -1,24 +1,43 @@
-class Chronic::RepeaterSeasonName < Chronic::RepeaterSeason #:nodoc:
-  @summer = ['jul 21', 'sep 22']
-  @autumn = ['sep 23', 'dec 21']
-  @winter = ['dec 22', 'mar 19']
-  @spring = ['mar 20', 'jul 20']
-  
-  def next(pointer)
-    super
-    raise 'Not implemented'
-  end
-  
-  def this(pointer = :future)
-    super
-    raise 'Not implemented'
-  end
-  
-  def width
-    (91 * 24 * 60 * 60)
-  end
-  
-  def to_s
-    super << '-season-' << @type.to_s
+module Chronic
+  class RepeaterSeasonName < RepeaterSeason #:nodoc:
+    SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
+    DAY_SECONDS = 86_400 # (24 * 60 * 60)
+
+    def next(pointer)
+      direction = pointer == :future ? 1 : -1
+      find_next_season_span(direction, @type)
+    end
+
+    def this(pointer = :future)
+      direction = pointer == :future ? 1 : -1
+
+      today = Chronic.construct(@now.year, @now.month, @now.day)
+      goal_ssn_start = today + direction * num_seconds_til_start(@type, direction)
+      goal_ssn_end = today + direction * num_seconds_til_end(@type, direction)
+      curr_ssn = find_current_season(MiniDate.from_time(@now))
+      case pointer
+      when :past
+        this_ssn_start = goal_ssn_start
+        this_ssn_end = (curr_ssn == @type) ? today : goal_ssn_end
+      when :future
+        this_ssn_start = (curr_ssn == @type) ? today + RepeaterDay::DAY_SECONDS : goal_ssn_start
+        this_ssn_end = goal_ssn_end
+      when :none
+        this_ssn_start = goal_ssn_start
+        this_ssn_end = goal_ssn_end
+      end
+
+      construct_season(this_ssn_start, this_ssn_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
+      time + amount * direction * RepeaterYear::YEAR_SECONDS
+    end
+
   end
 end

data/lib/chronic/repeaters/repeater_second.rb

@@ -1,36 +1,43 @@
-class Chronic::RepeaterSecond < Chronic::Repeater #:nodoc:
-  SECOND_SECONDS = 1 # haha, awesome
-  
-  def next(pointer = :future)
-    super
-    
-    direction = pointer == :future ? 1 : -1
-    
-    if !@second_start
-      @second_start = @now + (direction * SECOND_SECONDS)
-    else
-      @second_start += SECOND_SECONDS * direction
+module Chronic
+  class RepeaterSecond < Repeater #:nodoc:
+    SECOND_SECONDS = 1 # haha, awesome
+
+    def initialize(type, options = {})
+      super
+      @second_start = nil
+    end
+
+    def next(pointer = :future)
+      super
+
+      direction = pointer == :future ? 1 : -1
+
+      unless @second_start
+        @second_start = @now + (direction * SECOND_SECONDS)
+      else
+        @second_start += SECOND_SECONDS * direction
+      end
+
+      Span.new(@second_start, @second_start + SECOND_SECONDS)
+    end
+
+    def this(pointer = :future)
+      super
+
+      Span.new(@now, @now + 1)
+    end
+
+    def offset(span, amount, pointer)
+      direction = pointer == :future ? 1 : -1
+      span + direction * amount * SECOND_SECONDS
+    end
+
+    def width
+      SECOND_SECONDS
+    end
+
+    def to_s
+      super << '-second'
     end
-    
-    Chronic::Span.new(@second_start, @second_start + SECOND_SECONDS)
-  end
-  
-  def this(pointer = :future)
-    super
-    
-    Chronic::Span.new(@now, @now + 1)
-  end
-  
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * SECOND_SECONDS
-  end
-  
-  def width
-    SECOND_SECONDS
-  end
-  
-  def to_s
-    super << '-second'
   end
-end
+end

data/lib/chronic/repeaters/repeater_time.rb

@@ -1,114 +1,138 @@
-class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
-  class Tick #:nodoc:
-    attr_accessor :time
-    
-    def initialize(time, ambiguous = false)
-      @time = time
-      @ambiguous = ambiguous
-    end
-    
-    def ambiguous?
-      @ambiguous
-    end
-    
-    def *(other)
-      Tick.new(@time * other, @ambiguous)
-    end
-    
-    def to_f
-      @time.to_f
-    end
-    
-    def to_s
-      @time.to_s + (@ambiguous ? '?' : '')
+module Chronic
+  class RepeaterTime < Repeater #:nodoc:
+    class Tick #:nodoc:
+      attr_accessor :time
+
+      def initialize(time, ambiguous = false)
+        @time = time
+        @ambiguous = ambiguous
+      end
+
+      def ambiguous?
+        @ambiguous
+      end
+
+      def *(other)
+        Tick.new(@time * other, @ambiguous)
+      end
+
+      def to_f
+        @time.to_f
+      end
+
+      def to_s
+        @time.to_s + (@ambiguous ? '?' : '')
+      end
+
     end
-  end
-  
-  def initialize(time, options = {})
-    t = time.gsub(/\:/, '')
-    @type = 
-    if (1..2) === t.size
-      Tick.new(t.to_i * 60 * 60, true)
-    elsif t.size == 3
-      Tick.new((t[0..0].to_i * 60 * 60) + (t[1..2].to_i * 60), true)
-    elsif t.size == 4
-      ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-      Tick.new(t[0..1].to_i * 60 * 60 + t[2..3].to_i * 60, ambiguous)
-    elsif t.size == 5
-      Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
-    elsif t.size == 6
-      ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-      Tick.new(t[0..1].to_i * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
-    else
-      raise("Time cannot exceed six digits")
+
+    def initialize(time, options = {})
+      @current_time = nil
+      @options = options
+      time_parts = time.split(':')
+      raise ArgumentError, "Time cannot have more than 4 groups of ':'" if time_parts.count > 4
+
+      if time_parts.first.length > 2 and time_parts.count == 1
+        if time_parts.first.length > 4
+          second_index = time_parts.first.length - 2
+          time_parts.insert(1, time_parts.first[second_index..time_parts.first.length])
+          time_parts[0] = time_parts.first[0..second_index - 1]
+        end
+        minute_index = time_parts.first.length - 2
+        time_parts.insert(1, time_parts.first[minute_index..time_parts.first.length])
+        time_parts[0] = time_parts.first[0..minute_index - 1]
+      end
+
+      ambiguous = false
+      hours = time_parts.first.to_i
+
+      if @options[:hours24].nil? or (not @options[:hours24].nil? and @options[:hours24] != true)
+          ambiguous = true if (time_parts.first.length == 1 and hours > 0) or (hours >= 10 and hours <= 12) or (@options[:hours24] == false and hours > 0)
+          hours = 0 if hours == 12 and ambiguous
+      end
+
+      hours *= 60 * 60
+      minutes = 0
+      seconds = 0
+      subseconds = 0
+
+      minutes = time_parts[1].to_i * 60 if time_parts.count > 1
+      seconds = time_parts[2].to_i if time_parts.count > 2
+      subseconds = time_parts[3].to_f / (10 ** time_parts[3].length) if time_parts.count > 3
+
+      @type = Tick.new(hours + minutes + seconds + subseconds, ambiguous)
     end
-  end
-  
-  # Return the next past or future Span for the time that this Repeater represents
-  #   pointer - Symbol representing which temporal direction to fetch the next day
-  #             must be either :past or :future
-  def next(pointer)
-    super
-    
-    half_day = 60 * 60 * 12
-    full_day = 60 * 60 * 24
-    
-    first = false
-    
-    unless @current_time
-      first = true
-      midnight = Time.local(@now.year, @now.month, @now.day)
-      yesterday_midnight = midnight - full_day
-      tomorrow_midnight = midnight + full_day
-
-      catch :done do
-        if pointer == :future
-          if @type.ambiguous?
-            [midnight + @type, midnight + half_day + @type, tomorrow_midnight + @type].each do |t|
-              (@current_time = t; throw :done) if t > @now
-            end
-          else
-            [midnight + @type, tomorrow_midnight + @type].each do |t|
-              (@current_time = t; throw :done) if t > @now
-            end
-          end
-        else # pointer == :past
-          if @type.ambiguous?
-            [midnight + half_day + @type, midnight + @type, yesterday_midnight + @type * 2].each do |t|
-              (@current_time = t; throw :done) if t < @now
+
+    # Return the next past or future Span for the time that this Repeater represents
+    #   pointer - Symbol representing which temporal direction to fetch the next day
+    #             must be either :past or :future
+    def next(pointer)
+      super
+
+      half_day = 60 * 60 * 12
+      full_day = 60 * 60 * 24
+
+      first = false
+
+      unless @current_time
+        first = true
+        midnight = Chronic.time_class.local(@now.year, @now.month, @now.day)
+
+        yesterday_midnight = midnight - full_day
+        tomorrow_midnight = midnight + full_day
+
+        offset_fix = midnight.gmt_offset - tomorrow_midnight.gmt_offset
+        tomorrow_midnight += offset_fix
+
+        catch :done do
+          if pointer == :future
+            if @type.ambiguous?
+              [midnight + @type.time + offset_fix, midnight + half_day + @type.time + offset_fix, tomorrow_midnight + @type.time].each do |t|
+                (@current_time = t; throw :done) if t >= @now
+              end
+            else
+              [midnight + @type.time + offset_fix, tomorrow_midnight + @type.time].each do |t|
+                (@current_time = t; throw :done) if t >= @now
+              end
             end
-          else
-            [midnight + @type, yesterday_midnight + @type].each do |t|
-              (@current_time = t; throw :done) if t < @now
+          else # pointer == :past
+            if @type.ambiguous?
+              [midnight + half_day + @type.time + offset_fix, midnight + @type.time + offset_fix, yesterday_midnight + @type.time + half_day].each do |t|
+                (@current_time = t; throw :done) if t <= @now
+              end
+            else
+              [midnight + @type.time + offset_fix, yesterday_midnight + @type.time].each do |t|
+                (@current_time = t; throw :done) if t <= @now
+              end
             end
           end
         end
+
+        @current_time || raise("Current time cannot be nil at this point")
+      end
+
+      unless first
+        increment = @type.ambiguous? ? half_day : full_day
+        @current_time += pointer == :future ? increment : -increment
       end
-      
-      @current_time || raise("Current time cannot be nil at this point")
+
+      Span.new(@current_time, @current_time + width)
     end
-    
-    unless first
-      increment = @type.ambiguous? ? half_day : full_day
-      @current_time += pointer == :future ? increment : -increment
+
+    def this(context = :future)
+      super
+
+      context = :future if context == :none
+
+      self.next(context)
+    end
+
+    def width
+      1
+    end
+
+    def to_s
+      super << '-time-' << @type.to_s
     end
-    
-    Chronic::Span.new(@current_time, @current_time + width)
-  end
-  
-  def this(context = :future)
-    super
-    
-    context = :future if context == :none
-    
-    self.next(context)
-  end
-  
-  def width
-    1
-  end
-  
-  def to_s
-    super << '-time-' << @type.to_s
   end
-end
+end

data/lib/chronic/repeaters/repeater_week.rb

@@ -1,68 +1,75 @@
-class Chronic::RepeaterWeek < Chronic::Repeater #:nodoc:
-  WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
-  
-  def next(pointer)
-    super
-    
-    if !@current_week_start
+module Chronic
+  class RepeaterWeek < Repeater #:nodoc:
+    WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
+
+    def initialize(type, options = {})
+      super
+      @current_week_start = nil
+    end
+
+    def next(pointer)
+      super
+
+      unless @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
+
       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)
+        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)
-        @current_week_start = last_sunday_span.begin
+        this_week_start = last_sunday_span.begin
+        Span.new(this_week_start, this_week_start + WEEK_SECONDS)
       end
-    else
+    end
+
+    def offset(span, amount, pointer)
       direction = pointer == :future ? 1 : -1
-      @current_week_start += direction * WEEK_SECONDS
+      span + direction * amount * 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 = Time.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 = Time.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 width
+      WEEK_SECONDS
+    end
+
+    def to_s
+      super << '-week'
     end
   end
-  
-  def offset(span, amount, pointer)
-    direction = pointer == :future ? 1 : -1
-    span + direction * amount * WEEK_SECONDS
-  end
-  
-  def width
-    WEEK_SECONDS
-  end
-  
-  def to_s
-    super << '-week'
-  end
-end
+end