chronic 0.9.1 → 0.10.0

data/lib/chronic/repeaters/repeater_season.rb

@@ -8,8 +8,10 @@ module Chronic
       :winter => Season.new(MiniDate.new(12,22), MiniDate.new(3,19))
     }
 
-    def initialize(type)
+    def initialize(type, options = {})
       super
+      @next_season_start = nil
+      @next_season_end = nil
     end
 
     def next(pointer)
@@ -63,7 +65,7 @@ module Chronic
     private
 
     def find_next_season_span(direction, next_season)
-      unless @next_season_start or @next_season_end
+      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
@@ -106,4 +108,4 @@ module Chronic
       )
     end
   end
-end
+end

data/lib/chronic/repeaters/repeater_second.rb

@@ -2,8 +2,9 @@ module Chronic
   class RepeaterSecond < Repeater #:nodoc:
     SECOND_SECONDS = 1 # haha, awesome
 
-    def initialize(type)
+    def initialize(type, options = {})
       super
+      @second_start = nil
     end
 
     def next(pointer = :future)
@@ -11,7 +12,7 @@ module Chronic
 
       direction = pointer == :future ? 1 : -1
 
-      if !@second_start
+      unless @second_start
         @second_start = @now + (direction * SECOND_SECONDS)
       else
         @second_start += SECOND_SECONDS * direction
@@ -39,4 +40,4 @@ module Chronic
       super << '-second'
     end
   end
-end
+end

data/lib/chronic/repeaters/repeater_time.rb

@@ -26,31 +26,41 @@ module Chronic
 
     end
 
-    def initialize(time)
-      t = time.gsub(/\:/, '')
-
-      @type =
-      case t.size
-      when 1..2
-        hours = t.to_i
-        Tick.new((hours == 12 ? 0 : hours) * 60 * 60, true)
-      when 3
-        hours = t[0..0].to_i
-        ambiguous = hours > 0
-        Tick.new((hours * 60 * 60) + (t[1..2].to_i * 60), ambiguous)
-      when 4
-        ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-        hours = t[0..1].to_i
-        hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60, ambiguous)
-      when 5
-        Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
-      when 6
-        ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-        hours = t[0..1].to_i
-        hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous) : Tick.new(hours * 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
 
     # Return the next past or future Span for the time that this Repeater represents
@@ -125,4 +135,4 @@ module Chronic
       super << '-time-' << @type.to_s
     end
   end
-end
+end

data/lib/chronic/repeaters/repeater_week.rb

@@ -2,14 +2,15 @@ module Chronic
   class RepeaterWeek < Repeater #:nodoc:
     WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
 
-    def initialize(type)
+    def initialize(type, options = {})
       super
+      @current_week_start = nil
     end
 
     def next(pointer)
       super
 
-      if !@current_week_start
+      unless @current_week_start
         case pointer
         when :future
           sunday_repeater = RepeaterDayName.new(:sunday)
@@ -71,4 +72,4 @@ module Chronic
       super << '-week'
     end
   end
-end
+end

data/lib/chronic/repeaters/repeater_weekday.rb

@@ -11,8 +11,9 @@ module Chronic
       :saturday => 6
     }
 
-    def initialize(type)
+    def initialize(type, options = {})
       super
+      @current_weekday_start = nil
     end
 
     def next(pointer)
@@ -20,7 +21,7 @@ module Chronic
 
       direction = pointer == :future ? 1 : -1
 
-      if !@current_weekday_start
+      unless @current_weekday_start
         @current_weekday_start = Chronic.construct(@now.year, @now.month, @now.day)
         @current_weekday_start += direction * DAY_SECONDS
 
@@ -82,4 +83,4 @@ module Chronic
       DAYS[sym] || raise("Invalid symbol specified")
     end
   end
-end
+end

data/lib/chronic/repeaters/repeater_weekend.rb

@@ -2,14 +2,15 @@ module Chronic
   class RepeaterWeekend < Repeater #:nodoc:
     WEEKEND_SECONDS = 172_800 # (2 * 24 * 60 * 60)
 
-    def initialize(type)
+    def initialize(type, options = {})
       super
+      @current_week_start = nil
     end
 
     def next(pointer)
       super
 
-      if !@current_week_start
+      unless @current_week_start
         case pointer
         when :future
           saturday_repeater = RepeaterDayName.new(:saturday)
@@ -63,4 +64,4 @@ module Chronic
       super << '-weekend'
     end
   end
-end
+end

data/lib/chronic/repeaters/repeater_year.rb

@@ -2,14 +2,15 @@ module Chronic
   class RepeaterYear < Repeater #:nodoc:
     YEAR_SECONDS =  31536000  # 365 * 24 * 60 * 60
 
-    def initialize(type)
+    def initialize(type, options = {})
       super
+      @current_year_start = nil
     end
 
     def next(pointer)
       super
 
-      if !@current_year_start
+      unless @current_year_start
         case pointer
         when :future
           @current_year_start = Chronic.construct(@now.year + 1)
@@ -67,11 +68,11 @@ module Chronic
     end
 
     def month_days(year, month)
-      if Date.leap?(year)
+      if ::Date.leap?(year)
         RepeaterMonth::MONTH_DAYS_LEAP[month - 1]
       else
         RepeaterMonth::MONTH_DAYS[month - 1]
       end
     end
   end
-end
+end

data/lib/chronic/scalar.rb

@@ -11,88 +11,53 @@ module Chronic
     # Returns an Array of tokens.
     def self.scan(tokens, options)
       tokens.each_index do |i|
-        if t = scan_for_scalars(tokens[i], tokens[i + 1]) then tokens[i].tag(t) end
-        if t = scan_for_days(tokens[i], tokens[i + 1]) then tokens[i].tag(t) end
-        if t = scan_for_months(tokens[i], tokens[i + 1]) then tokens[i].tag(t) end
-        if t = scan_for_years(tokens[i], tokens[i + 1], options) then tokens[i].tag(t) end
-      end
-    end
-
-    # token - The Token object we want to scan.
-    # post_token - The next Token object.
-    #
-    # Returns a new Scalar object.
-    def self.scan_for_scalars(token, post_token)
-      if token.word =~ /^\d*$/
-        unless post_token && DAY_PORTIONS.include?(post_token.word)
-          return Scalar.new(token.word.to_i)
+        token = tokens[i]
+        post_token = tokens[i + 1]
+        if token.word =~ /^\d+$/
+            scalar = token.word.to_i
+            token.tag(Scalar.new(scalar))
+            token.tag(ScalarSubsecond.new(scalar)) if Chronic::Time::could_be_subsecond?(scalar)
+            token.tag(ScalarSecond.new(scalar)) if Chronic::Time::could_be_second?(scalar)
+            token.tag(ScalarMinute.new(scalar)) if Chronic::Time::could_be_minute?(scalar)
+            token.tag(ScalarHour.new(scalar)) if Chronic::Time::could_be_hour?(scalar)
+            unless post_token and DAY_PORTIONS.include?(post_token.word)
+              token.tag(ScalarDay.new(scalar)) if Chronic::Date::could_be_day?(scalar)
+              token.tag(ScalarMonth.new(scalar)) if Chronic::Date::could_be_month?(scalar)
+              if Chronic::Date::could_be_year?(scalar)
+                year = Chronic::Date::make_year(scalar, options[:ambiguous_year_future_bias])
+                token.tag(ScalarYear.new(year.to_i))
+              end
+            end
         end
       end
     end
 
-    # token - The Token object we want to scan.
-    # post_token - The next Token object.
-    #
-    # Returns a new Scalar object.
-    def self.scan_for_days(token, post_token)
-      if token.word =~ /^\d\d?$/
-        toi = token.word.to_i
-        unless toi > 31 || toi < 1 || (post_token && DAY_PORTIONS.include?(post_token.word))
-          return ScalarDay.new(toi)
-        end
-      end
+    def to_s
+      'scalar'
     end
+  end
 
-    # token - The Token object we want to scan.
-    # post_token - The next Token object.
-    #
-    # Returns a new Scalar object.
-    def self.scan_for_months(token, post_token)
-      if token.word =~ /^\d\d?$/
-        toi = token.word.to_i
-        unless toi > 12 || toi < 1 || (post_token && DAY_PORTIONS.include?(post_token.word))
-          return ScalarMonth.new(toi)
-        end
-      end
+  class ScalarSubsecond < Scalar #:nodoc:
+    def to_s
+      super << '-subsecond-' << @type.to_s
     end
+  end
 
-    # token - The Token object we want to scan.
-    # post_token - The next Token object.
-    # options - The Hash of options specified in Chronic::parse.
-    #
-    # Returns a new Scalar object.
-    def self.scan_for_years(token, post_token, options)
-      if token.word =~ /^([1-9]\d)?\d\d?$/
-        unless post_token && DAY_PORTIONS.include?(post_token.word)
-          year = make_year(token.word.to_i, options[:ambiguous_year_future_bias])
-          return ScalarYear.new(year.to_i)
-        end
-      end
+  class ScalarSecond < Scalar #:nodoc:
+    def to_s
+      super << '-second-' << @type.to_s
     end
+  end
 
-    # Build a year from a 2 digit suffix.
-    #
-    # year - The two digit Integer year to build from.
-    # bias - The Integer amount of future years to bias.
-    #
-    # Examples:
-    #
-    #   make_year(96, 50) #=> 1996
-    #   make_year(79, 20) #=> 2079
-    #   make_year(00, 50) #=> 2000
-    #
-    # Returns The Integer 4 digit year.
-    def self.make_year(year, bias)
-      return year if year.to_s.size > 2
-      start_year = Chronic.time_class.now.year - bias
-      century = (start_year / 100) * 100
-      full_year = century + year
-      full_year += 100 if full_year < start_year
-      full_year
+  class ScalarMinute < Scalar #:nodoc:
+    def to_s
+      super << '-minute-' << @type.to_s
     end
+  end
 
+  class ScalarHour < Scalar #:nodoc:
     def to_s
-      'scalar'
+      super << '-hour-' << @type.to_s
     end
   end
 

data/lib/chronic/separator.rb

@@ -11,11 +11,18 @@ module Chronic
     def self.scan(tokens, options)
       tokens.each do |token|
         if t = scan_for_commas(token) then token.tag(t); next end
-        if t = scan_for_slash_or_dash(token) then token.tag(t); next end
+        if t = scan_for_dots(token) then token.tag(t); next end
+        if t = scan_for_colon(token) then token.tag(t); next end
+        if t = scan_for_space(token) then token.tag(t); next end
+        if t = scan_for_slash(token) then token.tag(t); next end
+        if t = scan_for_dash(token) then token.tag(t); next end
+        if t = scan_for_quote(token) then token.tag(t); next end
         if t = scan_for_at(token) then token.tag(t); next end
         if t = scan_for_in(token) then token.tag(t); next end
         if t = scan_for_on(token) then token.tag(t); next end
         if t = scan_for_and(token) then token.tag(t); next end
+        if t = scan_for_t(token) then token.tag(t); next end
+        if t = scan_for_w(token) then token.tag(t); next end
       end
     end
 
@@ -28,12 +35,47 @@ module Chronic
 
     # token - The Token object we want to scan.
     #
-    # Returns a new SeparatorSlashOrDash object.
-    def self.scan_for_slash_or_dash(token)
-      scan_for token, SeparatorSlashOrDash,
+    # Returns a new SeparatorDot object.
+    def self.scan_for_dots(token)
+      scan_for token, SeparatorDot, { /^\.$/ => :dot }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeparatorColon object.
+    def self.scan_for_colon(token)
+      scan_for token, SeparatorColon, { /^:$/ => :colon }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeparatorSpace object.
+    def self.scan_for_space(token)
+      scan_for token, SeparatorSpace, { /^ $/ => :space }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeparatorSlash object.
+    def self.scan_for_slash(token)
+      scan_for token, SeparatorSlash, { /^\/$/ => :slash }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeparatorDash object.
+    def self.scan_for_dash(token)
+      scan_for token, SeparatorDash, { /^-$/ => :dash }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeparatorQuote object.
+    def self.scan_for_quote(token)
+      scan_for token, SeparatorQuote,
       {
-        /^-$/ => :dash,
-        /^\/$/ => :slash
+        /^'$/ => :single_quote,
+        /^"$/ => :double_quote
       }
     end
 
@@ -65,6 +107,20 @@ module Chronic
       scan_for token, SeparatorAnd, { /^and$/ => :and }
     end
 
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeperatorT Object object.
+    def self.scan_for_t(token)
+      scan_for token, SeparatorT, { /^t$/ => :T }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SeperatorW Object object.
+    def self.scan_for_w(token)
+      scan_for token, SeparatorW, { /^w$/ => :W }
+    end
+
     def to_s
       'separator'
     end
@@ -76,9 +132,39 @@ module Chronic
     end
   end
 
-  class SeparatorSlashOrDash < Separator #:nodoc:
+  class SeparatorDot < Separator #:nodoc:
     def to_s
-      super << '-slashordash-' << @type.to_s
+      super << '-dot'
+    end
+  end
+
+  class SeparatorColon < Separator #:nodoc:
+    def to_s
+      super << '-colon'
+    end
+  end
+
+  class SeparatorSpace < Separator #:nodoc:
+    def to_s
+      super << '-space'
+    end
+  end
+
+  class SeparatorSlash < Separator #:nodoc:
+    def to_s
+      super << '-slash'
+    end
+  end
+
+  class SeparatorDash < Separator #:nodoc:
+    def to_s
+      super << '-dash'
+    end
+  end
+
+  class SeparatorQuote < Separator #:nodoc:
+    def to_s
+      super << '-quote-' << @type.to_s
     end
   end
 
@@ -105,4 +191,17 @@ module Chronic
       super << '-and'
     end
   end
+
+  class SeparatorT < Separator #:nodoc:
+    def to_s
+      super << '-T'
+    end
+  end
+
+  class SeparatorW < Separator #:nodoc:
+    def to_s
+      super << '-W'
+    end
+  end
+
 end