chronic 0.1.0 → 0.1.5

data/History.txt

@@ -0,0 +1,29 @@
+= 0.1.5 2006-12-20
+
+* fixed 'aug 20' returning next year if current month is august
+* modified behavior of 'from now'
+* added support for seconds on times, and thus db timestamp format: "2006-12-20 18:04:23"
+* made Hoe compliant
+
+= 0.1.4
+
+* removed verbose error checking code. oops. :-/
+
+= 0.1.3
+
+* improved regexes for word variations (Josh Goebel)
+* fixed a bug that caused "today at 3am" to return nil if current time is after 3am
+
+= 0.1.2
+
+* removed Date dependency (now works on windows properly without fiddling)
+
+= 0.1.1
+
+* run to_s on incoming object
+* fixed loop loading of repeaters files (out of order on some machines)
+* fixed find_within to use this instead of next (was breaking "today at 6pm")
+
+= 0.1.0
+
+* initial release

data/Manifest.txt

@@ -0,0 +1,43 @@
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+lib/chronic.rb
+lib/chronic/chronic.rb
+lib/chronic/grabber.rb
+lib/chronic/handlers.rb
+lib/chronic/ordinal.rb
+lib/chronic/pointer.rb
+lib/chronic/repeater.rb
+lib/chronic/repeaters/repeater_day.rb
+lib/chronic/repeaters/repeater_day_name.rb
+lib/chronic/repeaters/repeater_day_portion.rb
+lib/chronic/repeaters/repeater_fortnight.rb
+lib/chronic/repeaters/repeater_hour.rb
+lib/chronic/repeaters/repeater_minute.rb
+lib/chronic/repeaters/repeater_month.rb
+lib/chronic/repeaters/repeater_month_name.rb
+lib/chronic/repeaters/repeater_season.rb
+lib/chronic/repeaters/repeater_season_name.rb
+lib/chronic/repeaters/repeater_second.rb
+lib/chronic/repeaters/repeater_time.rb
+lib/chronic/repeaters/repeater_week.rb
+lib/chronic/repeaters/repeater_weekend.rb
+lib/chronic/repeaters/repeater_year.rb
+lib/chronic/scalar.rb
+lib/chronic/separator.rb
+test/parse_numbers.rb
+test/suite.rb
+test/test_Chronic.rb
+test/test_Handler.rb
+test/test_RepeaterDayName.rb
+test/test_RepeaterFortnight.rb
+test/test_RepeaterHour.rb
+test/test_RepeaterMonth.rb
+test/test_RepeaterMonthName.rb
+test/test_RepeaterTime.rb
+test/test_RepeaterWeek.rb
+test/test_RepeaterYear.rb
+test/test_Span.rb
+test/test_Token.rb
+test/test_parsing.rb

data/{README → README.txt}

@@ -1,17 +1,22 @@
-=Chronic
+Chronic
+	http://chronic.rubyforge.org/
+	by Tom Preston-Werner
+
+== DESCRIPTION:
 
 Chronic is a natural language date/time parser written in pure Ruby. See below for the wide variety of formats Chronic will parse.
 
-==Installation
+== INSTALLATION:
 
 Chronic can be installed via RubyGems:
 
   $ sudo gem install chronic
 
-==Usage
+== USAGE:
 
 You can parse strings containing a natural language date using the Chronic.parse method.
 
+  require 'rubygems'
   require 'chronic'
 
   Time.now   #=> Sun Aug 27 23:18:25 PDT 2006
@@ -38,7 +43,7 @@ You can parse strings containing a natural language date using the Chronic.parse
 
 See Chronic.parse for detailed usage instructions.
 
-==Examples
+== EXAMPLES:
 
 Chronic can parse a huge variety of date and time formats. Following is a small sample of strings that will be properly parsed. Parsing is case insensitive and will handle common abbreviations and misspellings.
 
@@ -109,11 +114,36 @@ Specific Dates
 Specific Times (many of the above with an added time)
 
   January 5 at 7pm
-  1979-05-27 05:00
+  1979-05-27 05:00:00
   etc
 
-==Limitations
+== LIMITATIONS:
   
 Chronic uses Ruby's built in Time class for all time storage and computation. Because of this, only times that the Time class can handle will be properly parsed. Parsing for times outside of this range will simply return nil. Support for a wider range of times is planned for a future release.
 
-Time zones other than the local one are not currently supported. Support for other time zones is planned for a future release.
+Time zones other than the local one are not currently supported. Support for other time zones is planned for a future release.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2006 Ryan Davis, Zen Spider Software
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,39 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+require './lib/chronic.rb'
+
+Hoe.new('chronic', Chronic::VERSION) do |p|
+  p.rubyforge_name = 'chronic'
+  p.summary = 'A natural language date parser'
+  p.description = p.paragraphs_of('README.txt', 2).join("\n\n")
+  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+end
+
+# vim: syntax=Ruby
+
+__END__
+
+require 'rubygems'
+
+SPEC = Gem::Specification.new do |s|
+  s.name = 'chronic'
+  s.version = '0.1.5'
+  s.author = 'Tom Preston-Werner'
+  s.email = 'tom@rubyisawesome.com'
+  s.homepage = 'http://chronic.rubyforge.org'
+  s.platform = Gem::Platform::RUBY
+  s.summary = "A natural language date parser"
+  candidates = Dir["{lib,test}/**/*"]
+  s.files = candidates.delete_if do |item|
+    item.include?('.svn')
+  end
+  s.require_path = "lib"
+  s.autorequire = "chronic"
+  s.test_file = "test/suite.rb"
+  s.has_rdoc = true
+  s.extra_rdoc_files = ['README']
+  s.rdoc_options << '--main' << 'README'
+end

data/lib/chronic/chronic.rb

@@ -50,7 +50,7 @@ module Chronic
       specified_options.keys.each do |key|
         default_options.keys.include?(key) || raise(InvalidArgumentException, "#{key} is not a valid option key.")
       end
-      [:past, :future].include?(options[:context]) || raise(InvalidArgumentException, "Invalid value '#{options[:context]}' for :context specified. Valid values are :past and :future.")
+      [:past, :future, :none].include?(options[:context]) || raise(InvalidArgumentException, "Invalid value ':#{options[:context]}' for :context specified. Valid values are :past and :future.")
       
       # store now for later =)
       @now = options[:now]
@@ -73,7 +73,7 @@ module Chronic
       # strip any non-tagged tokens
       @tokens = @tokens.select { |token| token.tagged? }
       
-      if @debug
+      if Chronic.debug
         puts "+---------------------------------------------------"
         puts "| " + @tokens.to_s
         puts "+---------------------------------------------------"
@@ -100,7 +100,7 @@ module Chronic
     # to numbers (three => 3), and converting ordinal words to numeric
     # ordinals (third => 3rd)
     def pre_normalize(text) #:nodoc:
-      normalized_text = text.downcase
+      normalized_text = text.to_s.downcase
       normalized_text.gsub!(/['"\.]/, '')
       normalized_text.gsub!(/([\/\-\,\@])/) { ' ' + $1 + ' ' }
       normalized_text.gsub!(/\btoday\b/, 'this day')
@@ -108,7 +108,6 @@ module Chronic
       normalized_text.gsub!(/\byesterday\b/, 'last day')
       normalized_text.gsub!(/\bnoon\b/, '12:00')
       normalized_text.gsub!(/\bmidnight\b/, '24:00')
-      normalized_text.gsub!(/\bfrom now\b/, 'future')
       normalized_text.gsub!(/\bbefore now\b/, 'past')
       normalized_text.gsub!(/\bnow\b/, 'this second')
       normalized_text.gsub!(/\b(ago|before)\b/, 'past')

data/lib/chronic/handlers.rb

@@ -88,7 +88,7 @@ module Chronic
     
     def handle_m_d(month, day, time_tokens, options) #:nodoc:
       month.start = @now
-      span = month.next(options[:context])
+      span = month.this(options[:context])
       
       day_start = Time.local(span.begin.year, span.begin.month, day)
       
@@ -213,7 +213,7 @@ module Chronic
     
     def handle_s_r_p(tokens, options) #:nodoc:
       repeater = tokens[1].get_tag(Repeater)
-      
+            
       span = 
       case true
       when [RepeaterYear, RepeaterSeason, RepeaterSeasonName, RepeaterMonth, RepeaterMonthName, RepeaterFortnight, RepeaterWeek].include?(repeater.class)
@@ -274,32 +274,38 @@ module Chronic
       
       repeaters = self.get_repeaters(tokens)
       repeaters.size.times { tokens.pop }
-        
-      if tokens.last && tokens.last.get_tag(Grabber)
-        grabber = tokens.last.get_tag(Grabber)
+                    
+      if tokens.first && tokens.first.get_tag(Grabber)
+        grabber = tokens.first.get_tag(Grabber)
         tokens.pop
       end
       
       head = repeaters.shift
       head.start = @now
-      
+                  
       case grabber.type
-        when :last: outer_span = head.next(:past)
-        when :this: outer_span = head.this(options[:context])
-        when :next: outer_span = head.next(:future)
+        when :last
+          outer_span = head.next(:past)
+        when :this
+          if repeaters.size > 0
+            outer_span = head.this(:none)
+          else
+            outer_span = head.this(options[:context])
+          end
+        when :next
+          outer_span = head.next(:future)
         else raise(ChronicPain, "Invalid grabber")
       end
       
+      puts "--#{outer_span}" if Chronic.debug
       anchor = find_within(repeaters, outer_span, pointer)
     end
     
     def get_repeaters(tokens) #:nodoc:
       repeaters = []
-		  tokens.reverse.each do |token|
+		  tokens.each do |token|
 		    if t = token.get_tag(Repeater)
           repeaters << t
-        else
-          break
         end
       end
       repeaters.sort.reverse
@@ -309,12 +315,13 @@ module Chronic
     # Returns a Span representing the innermost time span
     # or nil if no repeater union could be found
     def find_within(tags, span, pointer) #:nodoc:
+      puts "--#{span}" if Chronic.debug
       return span if tags.empty?
       
       head, *rest = tags
       head.start = pointer == :future ? span.begin : span.end
-      h = head.next(pointer)
-      
+      h = head.this(:none)
+            
       if span.include?(h.begin) || span.include?(h.end)
         return find_within(rest, h, pointer)
       else

data/lib/chronic/repeater.rb

@@ -6,7 +6,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
       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
       if t = self.scan_for_times(tokens[i], options) then tokens[i].tag(t); next end
-      if t = self.scan_for_units(tokens[i]) then tokens[i].tag(t); next end 
+      if t = self.scan_for_units(tokens[i]) then tokens[i].tag(t); next end
     end
     tokens
   end
@@ -20,7 +20,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^jun\.?e?$/ => :june,
                /^jul\.?y?$/ => :july,
                /^aug\.?(ust)?$/ => :august,
-               /^sep\.?(tember)?$/ => :september,
+               /^sep\.?(t\.?|tember)?$/ => :september,
                /^oct\.?(ober)?$/ => :october,
                /^nov\.?(ember)?$/ => :november,
                /^dec\.?(ember)?$/ => :december}
@@ -52,7 +52,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^mornings?$/ => :morning,
                /^afternoons?$/ => :afternoon,
                /^evenings?$/ => :evening,
-               /^nights?$/ => :night}
+               /^(night|nite)s?$/ => :night}
     scanner.keys.each do |scanner_item|
       return Chronic::RepeaterDayPortion.new(scanner[scanner_item]) if scanner_item =~ token.word
     end
@@ -60,7 +60,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   end
   
   def self.scan_for_times(token, options)
-    if token.word =~ /^\d{1,2}(:?\d{2})?$/
+    if token.word =~ /^\d{1,2}(:?\d{2})?([\.:]?\d{2})?$/
       return Chronic::RepeaterTime.new(token.word, options)
     end
     return nil
@@ -99,13 +99,13 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   # returns the next occurance of this repeatable.
   def next(pointer)
     !@now.nil? || raise("Start point must be set before calling #next")
-    [:future, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
+    [: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 #next")
-    [:future, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
+    [:future, :past, :none].include?(pointer) || raise("First argument 'pointer' must be one of :past, :future, :none")
   end
   
   def to_s

data/lib/chronic/repeaters/repeater_day.rb

@@ -4,10 +4,14 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
   def next(pointer)
     super
     
-    @current_day ||= Date.parse(@now.to_s)
-    @current_day += pointer == :future ? 1 : -1
-    span_begin = Time.parse(@current_day.to_s)
-    Chronic::Span.new(span_begin, span_begin + width)
+    if !@current_day_start
+      @current_day_start = Time.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)
@@ -20,6 +24,9 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
     when :past
       day_begin = Time.local(@now.year, @now.month, @now.day)
       day_end = Time.local(@now.year, @now.month, @now.day, @now.hour)
+    when :none
+      day_begin = Time.local(@now.year, @now.month, @now.day)
+      day_end = Time.local(@now.year, @now.month, @now.day) + DAY_SECONDS
     end
     
     Chronic::Span.new(day_begin, day_end)

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -4,24 +4,29 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   def next(pointer)
     super
     
-    if !@current_day
-      @current_day = Date.parse(@now.to_s)
-      @current_day += pointer == :future ? 1 : -1
+    direction = pointer == :future ? 1 : -1
+    
+    if !@current_day_start
+      @current_day_start = Time.local(@now.year, @now.month, @now.day)
+      @current_day_start += direction * DAY_SECONDS
+
       day_num = symbol_to_number(@type)
-      while @current_day.wday != day_num
-        @current_day += pointer == :future ? 1 : -1
+      
+      while @current_day_start.wday != day_num
+        @current_day_start += direction * DAY_SECONDS
       end
     else
-      @current_day += pointer == :future ? 7 : -7
+      @current_day_start += direction * 7 * DAY_SECONDS
     end
-    span_begin = Time.parse(@current_day.to_s)
-    Chronic::Span.new(span_begin, span_begin + width)
+    
+    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
   
   def this(pointer = :future)
     super
     
-    self.next(:future)
+    pointer = :future if pointer == :none
+    self.next(pointer)
   end
   
   def width

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -29,6 +29,8 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
   def this(pointer = :future)
     super
     
+    pointer = :future if pointer == :none
+    
     case pointer
     when :future
       this_fortnight_start = Time.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
@@ -42,7 +44,6 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
       this_fortnight_end = Time.local(@now.year, @now.month, @now.day, @now.hour)
       sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
       sunday_repeater.start = @now
-      #sunday_repeater.next(:past)
       last_sunday_span = sunday_repeater.next(:past)
       this_fortnight_start = last_sunday_span.begin
       Chronic::Span.new(this_fortnight_start, this_fortnight_end)

data/lib/chronic/repeaters/repeater_minute.rb

@@ -1,9 +1,30 @@
 class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
   MINUTE_SECONDS = 60
   
+  def next(pointer = :future)
+    super
+    
+    direction = pointer == :future ? 1 : -1
+    
+    raise 'not implemented'
+  end
+  
   def this(pointer = :future)
-    minute_begin = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
-    Chronic::Span.new(minute_begin, minute_begin + MINUTE_SECONDS)
+    super
+    
+    case pointer
+    when :future
+      minute_begin = @now
+      minute_end = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+    when :past
+      minute_begin = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = @now
+    when :none
+      minute_begin = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = Time.local(@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)

data/lib/chronic/repeaters/repeater_month.rb

@@ -24,6 +24,9 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
     when :past
       month_start = Time.local(@now.year, @now.month)
       month_end = Time.local(@now.year, @now.month, @now.day)
+    when :none
+      month_start = Time.local(@now.year, @now.month)
+      month_end = self.offset_by(Time.local(@now.year, @now.month), 1, :future)
     end
     
     Chronic::Span.new(month_start, month_end)

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -13,6 +13,12 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
         else @now.month > target_month
           @current_month_begin = Time.local(@now.year + 1, target_month)
         end
+      when :none
+        if @now.month <= target_month
+          @current_month_begin = Time.local(@now.year, target_month)
+        else @now.month > target_month
+          @current_month_begin = Time.local(@now.year + 1, target_month)
+        end
       when :past
         if @now.month > target_month
           @current_month_begin = Time.local(@now.year, target_month)
@@ -47,7 +53,12 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
   def this(pointer = :future)
     super
     
-    self.next(pointer)
+    case pointer
+    when :past
+      self.next(pointer)
+    when :future, :none
+      self.next(:none)
+    end
   end
   
   def width

data/lib/chronic/repeaters/repeater_second.rb

@@ -16,6 +16,8 @@ class Chronic::RepeaterSecond < Chronic::Repeater #:nodoc:
   end
   
   def this(pointer = :future)
+    super
+    
     Chronic::Span.new(@now, @now + 1)
   end
   

data/lib/chronic/repeaters/repeater_time.rb

@@ -25,7 +25,7 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
   end
   
   def initialize(time, options = {})
-    t = time.sub(/\:/, '')
+    t = time.gsub(/\:/, '')
     @type = 
     if (1..2) === t.size
       Tick.new(t.to_i * 60 * 60, true)
@@ -34,8 +34,13 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
     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 four digits")
+      raise("Time cannot exceed six digits")
     end
   end
   
@@ -92,7 +97,10 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
   end
   
   def this(context = :future)
-    [:future, :past].include?(context) || raise("First argument 'context' must be one of :past or :future")
+    super
+    
+    context = :future if context == :none
+    
     self.next(context)
   end
   

data/lib/chronic/repeaters/repeater_week.rb

@@ -44,6 +44,12 @@ class Chronic::RepeaterWeek < Chronic::Repeater #:nodoc:
       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)
     end
   end
   

data/lib/chronic/repeaters/repeater_year.rb

@@ -28,6 +28,9 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     when :past
       this_year_start = Time.local(@now.year, 1, 1)
       this_year_end = Time.local(@now.year, @now.month, @now.day)
+    when :none
+      this_year_start = Time.local(@now.year, 1, 1)
+      this_year_end = Time.local(@now.year + 1, 1, 1)
     end
     
     Chronic::Span.new(this_year_start, this_year_end)

data/lib/chronic/scalar.rb

@@ -40,7 +40,7 @@ module Chronic
     end
     
     def self.scan_for_years(token, post_token)
-      if token.word =~ /^\d\d(\d\d)?$/
+      if token.word =~ /^([1-9]\d)?\d\d?$/
         unless post_token && %w{am pm morning afternoon evening night}.include?(post_token)
           return ScalarYear.new(token.word.to_i)
         end

data/lib/chronic.rb

@@ -7,24 +7,41 @@
 #
 #=============================================================================
 
-require 'date'
-
 require 'chronic/chronic'
 require 'chronic/handlers'
+
+require 'chronic/repeater'
+require 'chronic/repeaters/repeater_year'
+require 'chronic/repeaters/repeater_season'
+require 'chronic/repeaters/repeater_season_name'
+require 'chronic/repeaters/repeater_month'
+require 'chronic/repeaters/repeater_month_name'
+require 'chronic/repeaters/repeater_fortnight'
+require 'chronic/repeaters/repeater_week'
+require 'chronic/repeaters/repeater_weekend'
+require 'chronic/repeaters/repeater_day'
+require 'chronic/repeaters/repeater_day_name'
+require 'chronic/repeaters/repeater_day_portion'
+require 'chronic/repeaters/repeater_hour'
+require 'chronic/repeaters/repeater_minute'
+require 'chronic/repeaters/repeater_second'
+require 'chronic/repeaters/repeater_time'
+
 require 'chronic/grabber'
-require 'chronic/ordinal'
 require 'chronic/pointer'
 require 'chronic/scalar'
+require 'chronic/ordinal'
 require 'chronic/separator'
 
-require 'chronic/repeater'
-Dir["#{File.dirname(__FILE__)}/chronic/repeaters/*.rb"].each do |file|
-  require file
-end
-
 module Chronic
-  def self.debug=(val); @debug = val; end
+  VERSION = "0.1.5"
+  
+  def self.debug; false; end
 end
 
-Chronic.debug = false
+alias p_orig p
 
+def p(val)
+  p_orig val
+  puts
+end

data/test/test_parsing.rb

@@ -7,7 +7,6 @@ class TestParsing < Test::Unit::TestCase
     # Wed Aug 16 14:00:00 UTC 2006
     @time_2006_08_16_14_00_00 = Time.local(2006, 8, 16, 14, 0, 0, 0)
     @time_2006_08_16_03_00_00 = Time.local(2006, 8, 16, 3, 0, 0, 0)
-    Chronic.debug = false
   end
   
   def test__parse_guess_dates
@@ -25,6 +24,9 @@ class TestParsing < Test::Unit::TestCase
     time = Chronic.parse("may 28 at 5pm", :now => @time_2006_08_16_14_00_00, :context => :past)
     assert_equal Time.local(2006, 5, 28, 17), time
     
+    time = Chronic.parse("may 28 at 5:32.19pm", :now => @time_2006_08_16_14_00_00, :context => :past)
+    assert_equal Time.local(2006, 5, 28, 17, 32, 19), time
+    
     # rm_od
     
     time = Chronic.parse("may 27th", :now => @time_2006_08_16_14_00_00)
@@ -125,6 +127,15 @@ class TestParsing < Test::Unit::TestCase
     time = Chronic.parse("2006-08-20 03:00", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 20, 3), time
     
+    time = Chronic.parse("2006-08-20 03:30:30", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 20, 3, 30, 30), time
+    
+    time = Chronic.parse("2006-08-20 15:30:30", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 20, 15, 30, 30), time
+    
+    time = Chronic.parse("2006-08-20 15:30.30", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 20, 15, 30, 30), time
+    
     # rm_sd_rt
     
     #time = Chronic.parse("jan 5 13:00", :now => @time_2006_08_16_14_00_00)
@@ -184,8 +195,11 @@ class TestParsing < Test::Unit::TestCase
     time = Chronic.parse("4:00 in the morning", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 16, 4), time
     
-    #time = Chronic.parse("november 4", :now => @time_2006_08_16_14_00_00)
-    #assert_equal Time.local(2006, 11, 4, 12), time
+    time = Chronic.parse("november 4", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 11, 4, 12), time
+    
+    time = Chronic.parse("aug 24", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 24, 12), time
   end
   
   def test_parse_guess_rrr
@@ -300,10 +314,22 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 8, 16, 13, 59, 59), time
   end
   
-  def test_parse_guess_grr
+  def test_parse_guess_grr    
     time = Chronic.parse("yesterday at 4:00", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 15, 16), time
     
+    time = Chronic.parse("today at 9:00", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 16, 9), time
+    
+    time = Chronic.parse("today at 2100", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 16, 21), time
+    
+    time = Chronic.parse("this day at 0900", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 16, 9), time
+    
+    time = Chronic.parse("tomorrow at 0900", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 17, 9), time
+    
     time = Chronic.parse("yesterday at 4:00", :now => @time_2006_08_16_14_00_00, :ambiguous_time_range => :none)
     assert_equal Time.local(2006, 8, 15, 4), time
     
@@ -321,6 +347,15 @@ class TestParsing < Test::Unit::TestCase
   end
   
   def test_parse_guess_grrr
+    time = Chronic.parse("today at 6:00pm", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 16, 18), time
+    
+    time = Chronic.parse("today at 6:00am", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 16, 6), time
+    
+    time = Chronic.parse("this day 1800", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 16, 18), time
+    
     time = Chronic.parse("yesterday at 4:00pm", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 15, 16), time
   end
@@ -352,7 +387,7 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 7, 26, 14, 30, 30), time
     
     time = Chronic.parse("3 days ago", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2006, 8, 13, 14, 0, 30), time
+    assert_equal Time.local(2006, 8, 13, 14), time
     
     #time = Chronic.parse("1 monday ago", :now => @time_2006_08_16_14_00_00)
     #assert_equal Time.local(2006, 8, 14, 12), time
@@ -361,7 +396,7 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 8, 12, 9), time
     
     time = Chronic.parse("7 hours ago", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2006, 8, 16, 7, 0, 30), time
+    assert_equal Time.local(2006, 8, 16, 7), time
     
     time = Chronic.parse("3 minutes ago", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 16, 13, 57), time
@@ -372,7 +407,7 @@ class TestParsing < Test::Unit::TestCase
     # future
     
     time = Chronic.parse("3 years from now", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2009, 8, 16, 14, 30, 30), time
+    assert_equal Time.local(2009, 8, 16, 14, 0, 0), time
     
     time = Chronic.parse("6 months hence", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2007, 2, 16, 14, 30, 30), time
@@ -381,16 +416,16 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 9, 27, 14, 30, 30), time
     
     time = Chronic.parse("1 week from now", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2006, 8, 23, 14, 30, 30), time
+    assert_equal Time.local(2006, 8, 23, 14, 0, 0), time
     
     time = Chronic.parse("1 day hence", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2006, 8, 17, 14, 0, 30), time
+    assert_equal Time.local(2006, 8, 17, 14), time
     
     time = Chronic.parse("5 mornings hence", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 21, 9), time
     
     time = Chronic.parse("1 hour from now", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2006, 8, 16, 15, 0, 30), time
+    assert_equal Time.local(2006, 8, 16, 15), time
     
     time = Chronic.parse("20 minutes hence", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 16, 14, 20), time
@@ -401,7 +436,7 @@ class TestParsing < Test::Unit::TestCase
   
   def test_parse_guess_p_s_r
     time = Chronic.parse("in 3 hours", :now => @time_2006_08_16_14_00_00)
-    assert_equal Time.local(2006, 8, 16, 17, 0, 30), time
+    assert_equal Time.local(2006, 8, 16, 17), time
   end
   
   def test_parse_guess_s_r_p_a

metadata

@@ -3,16 +3,16 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: chronic
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-09-06 00:00:00 -07:00
+  version: 0.1.5
+date: 2006-12-21 00:00:00 -08:00
 summary: A natural language date parser
 require_paths: 
 - lib
-email: tom@rubyisawesome.com
-homepage: http://chronic.rubyforge.org
-rubyforge_project: 
-description: 
-autorequire: chronic
+email: ryand-ruby@zenspider.com
+homepage: "\thttp://chronic.rubyforge.org/"
+rubyforge_project: chronic
+description: Chronic is a natural language date/time parser written in pure Ruby. See below for the wide variety of formats Chronic will parse.
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
@@ -26,9 +26,12 @@ platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-- Tom Werner
+- Ryan Davis
 files: 
-- lib/chronic
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
 - lib/chronic.rb
 - lib/chronic/chronic.rb
 - lib/chronic/grabber.rb
@@ -36,9 +39,6 @@ files:
 - lib/chronic/ordinal.rb
 - lib/chronic/pointer.rb
 - lib/chronic/repeater.rb
-- lib/chronic/repeaters
-- lib/chronic/scalar.rb
-- lib/chronic/separator.rb
 - lib/chronic/repeaters/repeater_day.rb
 - lib/chronic/repeaters/repeater_day_name.rb
 - lib/chronic/repeaters/repeater_day_portion.rb
@@ -54,11 +54,12 @@ files:
 - lib/chronic/repeaters/repeater_week.rb
 - lib/chronic/repeaters/repeater_weekend.rb
 - lib/chronic/repeaters/repeater_year.rb
+- lib/chronic/scalar.rb
+- lib/chronic/separator.rb
 - test/parse_numbers.rb
 - test/suite.rb
 - test/test_Chronic.rb
 - test/test_Handler.rb
-- test/test_parsing.rb
 - test/test_RepeaterDayName.rb
 - test/test_RepeaterFortnight.rb
 - test/test_RepeaterHour.rb
@@ -69,19 +70,38 @@ files:
 - test/test_RepeaterYear.rb
 - test/test_Span.rb
 - test/test_Token.rb
-- README
+- test/test_parsing.rb
 test_files: 
-- test/suite.rb
-rdoc_options: 
-- --main
-- README
-extra_rdoc_files: 
-- README
+- test/test_Chronic.rb
+- test/test_Handler.rb
+- test/test_parsing.rb
+- test/test_RepeaterDayName.rb
+- test/test_RepeaterFortnight.rb
+- test/test_RepeaterHour.rb
+- test/test_RepeaterMonth.rb
+- test/test_RepeaterMonthName.rb
+- test/test_RepeaterTime.rb
+- test/test_RepeaterWeek.rb
+- test/test_RepeaterYear.rb
+- test/test_Span.rb
+- test/test_Token.rb
+rdoc_options: []
+
+extra_rdoc_files: []
+
 executables: []
 
 extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
+    version: