chronic 0.2.3 → 0.3.0

data/lib/{numerizer → chronic/numerizer}/numerizer.rb

@@ -44,32 +44,34 @@ class Numerizer
                     ['trillion', 1_000_000_000_000],
                   ]
 
-class << self
-  def numerize(string)
+  def self.numerize(string)
     string = string.dup
-  
+
     # preprocess
-    string.gsub!(/ +|([^\d])-([^d])/, '\1 \2') # will mutilate hyphenated-words but shouldn't matter for date extraction
+    string.gsub!(/ +|([^\d])-([^\d])/, '\1 \2') # will mutilate hyphenated-words but shouldn't matter for date extraction
     string.gsub!(/a half/, 'haAlf') # take the 'a' out so it doesn't turn into a 1, save the half for the end
 
     # easy/direct replacements
-  
+
     DIRECT_NUMS.each do |dn|
-      string.gsub!(/#{dn[0]}/i, dn[1])
+      string.gsub!(/#{dn[0]}/i, '<num>' + dn[1])
     end
 
     # ten, twenty, etc.
 
     TEN_PREFIXES.each do |tp|
-      string.gsub!(/(?:#{tp[0]})( *\d(?=[^\d]|$))*/i) { (tp[1] + $1.to_i).to_s }
+      string.gsub!(/(?:#{tp[0]}) *<num>(\d(?=[^\d]|$))*/i) { '<num>' + (tp[1] + $1.to_i).to_s }
+    end
+
+    TEN_PREFIXES.each do |tp|
+      string.gsub!(/#{tp[0]}/i) { '<num>' + tp[1].to_s }
     end
 
     # hundreds, thousands, millions, etc.
 
     BIG_PREFIXES.each do |bp|
-      string.gsub!(/(\d*) *#{bp[0]}/i) { (bp[1] * $1.to_i).to_s}
+      string.gsub!(/(?:<num>)?(\d*) *#{bp[0]}/i) { '<num>' + (bp[1] * $1.to_i).to_s}
       andition(string)
-      #combine_numbers(string) # Should to be more efficient way to do this
     end
 
     # fractional addition
@@ -77,27 +79,19 @@ class << self
     # (with extraneous .0's and such )
     string.gsub!(/(\d+)(?: | and |-)*haAlf/i) { ($1.to_f + 0.5).to_s }
 
-    string
+    string.gsub(/<num>/, '')
   end
 
-private
-  def andition(string)
+  private
+
+  def self.andition(string)
     sc = StringScanner.new(string)
-    while(sc.scan_until(/(\d+)( | and )(\d+)(?=[^\w]|$)/i))
+    while(sc.scan_until(/<num>(\d+)( | and )<num>(\d+)(?=[^\w]|$)/i))
       if sc[2] =~ /and/ || sc[1].size > sc[3].size
-        string[(sc.pos - sc.matched_size)..(sc.pos-1)] = (sc[1].to_i + sc[3].to_i).to_s
+        string[(sc.pos - sc.matched_size)..(sc.pos-1)] = '<num>' + (sc[1].to_i + sc[3].to_i).to_s
         sc.reset
       end
     end
   end
 
-#  def combine_numbers(string)
-#    sc = StringScanner.new(string)
-#    while(sc.scan_until(/(\d+)(?: | and |-)(\d+)(?=[^\w]|$)/i))
-#      string[(sc.pos - sc.matched_size)..(sc.pos-1)] = (sc[1].to_i + sc[2].to_i).to_s
-#      sc.reset
-#    end
-#  end
-
 end
-end

data/lib/chronic/ordinal.rb

@@ -9,32 +9,32 @@ module Chronic
       end
       tokens
     end
-  
+
     def self.scan_for_ordinals(token)
       if token.word =~ /^(\d*)(st|nd|rd|th)$/
         return Ordinal.new($1.to_i)
       end
       return nil
     end
-    
+
     def self.scan_for_days(token)
       if token.word =~ /^(\d*)(st|nd|rd|th)$/
-        unless $1.to_i > 31
+        unless $1.to_i > 31 || $1.to_i < 1
           return OrdinalDay.new(token.word.to_i)
         end
       end
       return nil
     end
-    
+
     def to_s
       'ordinal'
     end
   end
-  
+
   class OrdinalDay < Ordinal #:nodoc:
     def to_s
       super << '-day-' << @type.to_s
     end
   end
 
-end
+end

data/lib/chronic/pointer.rb

@@ -8,7 +8,7 @@ module Chronic
       end
       tokens
     end
-  
+
     def self.scan_for_all(token)
       scanner = {/\bpast\b/ => :past,
                  /\bfuture\b/ => :future,
@@ -18,10 +18,10 @@ module Chronic
       end
       return nil
     end
-    
+
     def to_s
       'pointer-' << @type.to_s
     end
   end
 
-end
+end

data/lib/chronic/repeater.rb

@@ -2,6 +2,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   def self.scan(tokens, options)
     # for each token
     tokens.each_index do |i|
+      if t = self.scan_for_season_names(tokens[i]) then tokens[i].tag(t); next end
       if t = self.scan_for_month_names(tokens[i]) then tokens[i].tag(t); next end
       if t = self.scan_for_day_names(tokens[i]) then tokens[i].tag(t); next end
       if t = self.scan_for_day_portions(tokens[i]) then tokens[i].tag(t); next end
@@ -10,7 +11,19 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
     end
     tokens
   end
-  
+
+  def self.scan_for_season_names(token)
+    scanner = {/^springs?$/ => :spring,
+               /^summers?$/ => :summer,
+               /^(autumn)|(fall)s?$/ => :autumn,
+               /^winters?$/ => :winter}
+    scanner.keys.each do |scanner_item|
+      return Chronic::RepeaterSeasonName.new(scanner[scanner_item]) if scanner_item =~ token.word
+    end
+
+    return nil
+  end
+
   def self.scan_for_month_names(token)
     scanner = {/^jan\.?(uary)?$/ => :january,
                /^feb\.?(ruary)?$/ => :february,
@@ -29,7 +42,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
     end
     return nil
   end
-  
+
   def self.scan_for_day_names(token)
     scanner = {/^m[ou]n(day)?$/ => :monday,
                /^t(ue|eu|oo|u|)s(day)?$/ => :tuesday,
@@ -46,7 +59,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
     end
     return nil
   end
-  
+
   def self.scan_for_day_portions(token)
     scanner = {/^ams?$/ => :am,
                /^pms?$/ => :pm,
@@ -59,14 +72,14 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
     end
     return nil
   end
-  
+
   def self.scan_for_times(token, options)
     if token.word =~ /^\d{1,2}(:?\d{2})?([\.:]?\d{2})?$/
       return Chronic::RepeaterTime.new(token.word, options)
     end
     return nil
   end
-  
+
   def self.scan_for_units(token)
     scanner = {/^years?$/ => :year,
                /^seasons?$/ => :season,
@@ -74,6 +87,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^fortnights?$/ => :fortnight,
                /^weeks?$/ => :week,
                /^weekends?$/ => :weekend,
+               /^(week|business)days?$/ => :weekday,
                /^days?$/ => :day,
                /^hours?$/ => :hour,
                /^minutes?$/ => :minute,
@@ -82,34 +96,34 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
       if scanner_item =~ token.word
         klass_name = 'Chronic::Repeater' + scanner[scanner_item].to_s.capitalize
         klass = eval(klass_name)
-        return klass.new(scanner[scanner_item]) 
+        return klass.new(scanner[scanner_item])
       end
     end
     return nil
   end
-  
+
   def <=>(other)
     width <=> other.width
   end
-  
+
   # returns the width (in seconds or months) of this repeatable.
   def width
     raise("Repeatable#width must be overridden in subclasses")
   end
-  
+
   # returns the next occurance of this repeatable.
   def next(pointer)
     !@now.nil? || raise("Start point must be set before calling #next")
     [:future, :none, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
     #raise("Repeatable#next must be overridden in subclasses")
   end
-  
+
   def this(pointer)
     !@now.nil? || raise("Start point must be set before calling #this")
     [:future, :past, :none].include?(pointer) || raise("First argument 'pointer' must be one of :past, :future, :none")
   end
-  
+
   def to_s
     'repeater'
   end
-end
+end

data/lib/chronic/repeaters/repeater_day.rb

@@ -1,22 +1,27 @@
 class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
   DAY_SECONDS = 86_400 # (24 * 60 * 60)
-  
+
+  def initialize(type)
+    super
+    @current_day_start = nil
+  end
+
   def next(pointer)
     super
-    
+
     if !@current_day_start
-      @current_day_start = Time.local(@now.year, @now.month, @now.day)
+      @current_day_start = Chronic.time_class.local(@now.year, @now.month, @now.day)
     end
-    
+
     direction = pointer == :future ? 1 : -1
     @current_day_start += direction * DAY_SECONDS
-    
+
     Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
-  
+
   def this(pointer = :future)
     super
-    
+
     case pointer
     when :future
       day_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
@@ -28,20 +33,20 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
       day_begin = Time.construct(@now.year, @now.month, @now.day)
       day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
     end
-    
+
     Chronic::Span.new(day_begin, day_end)
   end
-  
+
   def offset(span, amount, pointer)
     direction = pointer == :future ? 1 : -1
     span + direction * amount * DAY_SECONDS
   end
-  
+
   def width
     DAY_SECONDS
   end
-  
+
   def to_s
     super << '-day'
   end
-end
+end

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -1,46 +1,51 @@
 class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   DAY_SECONDS = 86400 # (24 * 60 * 60)
-  
+
+  def initialize(type)
+    super
+    @current_day_start = nil
+  end
+
   def next(pointer)
     super
-    
+
     direction = pointer == :future ? 1 : -1
-    
+
     if !@current_day_start
       @current_day_start = Time.construct(@now.year, @now.month, @now.day)
       @current_day_start += direction * DAY_SECONDS
 
       day_num = symbol_to_number(@type)
-      
+
       while @current_day_start.wday != day_num
         @current_day_start += direction * DAY_SECONDS
       end
     else
       @current_day_start += direction * 7 * DAY_SECONDS
     end
-    
+
     Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
-  
+
   def this(pointer = :future)
     super
-    
+
     pointer = :future if pointer == :none
     self.next(pointer)
   end
-  
+
   def width
     DAY_SECONDS
   end
-  
+
   def to_s
     super << '-dayname-' << @type.to_s
   end
-  
+
   private
-  
+
   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")
   end
-end
+end

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -3,10 +3,11 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
   @@afternoon = (13 * 60 * 60)..(17 * 60 * 60) # 1pm-5pm
   @@evening = (17 * 60 * 60)..(20 * 60 * 60) # 5pm-8pm
   @@night = (20 * 60 * 60)..(24 * 60 * 60) # 8pm-12pm
-  
+
   def initialize(type)
     super
-    
+    @current_span = nil
+
     if type.kind_of? Integer
       @range = (@type * 60 * 60)..((@type + 12) * 60 * 60)
     else
@@ -21,12 +22,12 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
     end
     @range || raise("Range should have been set by now")
   end
-  
+
   def next(pointer)
     super
-    
+
     full_day = 60 * 60 * 24
-    
+
     if !@current_span
       now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
       if now_seconds < @range.begin
@@ -51,7 +52,7 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
           range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
         end
       end
-      
+
       @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
     else
       case pointer
@@ -62,21 +63,21 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
       end
     end
   end
-  
+
   def this(context = :future)
     super
-    
+
     range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
     @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
   end
-  
+
   def offset(span, amount, pointer)
     @now = span.begin
     portion_span = self.next(pointer)
     direction = pointer == :future ? 1 : -1
     portion_span + (direction * (amount - 1) * Chronic::RepeaterDay::DAY_SECONDS)
   end
-  
+
   def width
     @range || raise("Range has not been set")
     return @current_span.width if @current_span
@@ -86,8 +87,8 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
       @range.end - @range.begin
     end
   end
-  
+
   def to_s
     super << '-dayportion-' << @type.to_s
   end
-end
+end