chronic 0.1.0 → 0.1.1

data/lib/chronic.rb

@@ -11,17 +11,30 @@ 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
 end

data/lib/chronic/chronic.rb

@@ -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')

data/lib/chronic/handlers.rb

@@ -274,15 +274,15 @@ 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])
@@ -295,11 +295,9 @@ module Chronic
     
     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
@@ -313,8 +311,8 @@ module Chronic
       
       head, *rest = tags
       head.start = pointer == :future ? span.begin : span.end
-      h = head.next(pointer)
-      
+      h = head.this(pointer)
+            
       if span.include?(h.begin) || span.include?(h.end)
         return find_within(rest, h, pointer)
       else

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -21,7 +21,7 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   def this(pointer = :future)
     super
     
-    self.next(:future)
+    self.next(pointer)
   end
   
   def width

data/test/test_parsing.rb

@@ -321,6 +321,12 @@ 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("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

metadata

@@ -3,8 +3,8 @@ 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.1
+date: 2006-09-09 00:00:00 -07:00
 summary: A natural language date parser
 require_paths: 
 - lib
@@ -26,7 +26,7 @@ platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-- Tom Werner
+- Tom Preston-Werner
 files: 
 - lib/chronic
 - lib/chronic.rb