chronic 0.8.0 → 0.9.1

data/test/test_handler.rb

@@ -7,18 +7,22 @@ class TestHandler < TestCase
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
 
+  def definitions
+    @definitions ||= Chronic::Parser.new.definitions
+  end
+
   def test_handler_class_1
     handler = Chronic::Handler.new([:repeater], :handler)
 
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
 
-    assert !handler.match(tokens, Chronic.definitions)
+    assert !handler.match(tokens, definitions)
   end
 
   def test_handler_class_2
@@ -27,17 +31,17 @@ class TestHandler < TestCase
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('afternoon')
     tokens[2].tag(Chronic::RepeaterDayPortion.new(:afternoon))
 
-    assert !handler.match(tokens, Chronic.definitions)
+    assert !handler.match(tokens, definitions)
   end
 
   def test_handler_class_3
@@ -46,12 +50,12 @@ class TestHandler < TestCase
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
 
-    assert !handler.match(tokens, Chronic.definitions)
+    assert !handler.match(tokens, definitions)
   end
 
   def test_handler_class_4
@@ -60,12 +64,12 @@ class TestHandler < TestCase
     tokens = [Chronic::Token.new('may')]
     tokens[0].tag(Chronic::RepeaterMonthName.new(:may))
 
-    assert !handler.match(tokens, Chronic.definitions)
+    assert !handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('27')
     tokens[1].tag(Chronic::ScalarDay.new(27))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
   end
 
   def test_handler_class_5
@@ -74,17 +78,17 @@ class TestHandler < TestCase
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('5:00')
     tokens[1].tag(Chronic::RepeaterTime.new('5:00'))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
 
     tokens << Chronic::Token.new('pm')
     tokens[2].tag(Chronic::RepeaterDayPortion.new(:pm))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
   end
 
   def test_handler_class_6
@@ -98,7 +102,7 @@ class TestHandler < TestCase
     tokens[1].tag(Chronic::RepeaterYear.new(:year))
     tokens[2].tag(Chronic::Pointer.new(:past))
 
-    assert handler.match(tokens, Chronic.definitions)
+    assert handler.match(tokens, definitions)
   end
 
 end

data/test/test_numerizer.rb

@@ -57,12 +57,26 @@ class ParseNumbersTest < TestCase
       'second day' => '2nd day',
       'second of may' => '2nd of may',
       'fifth' => '5th',
+      'twelfth' => '12th',
+      'twentieth' => '20th',
+      'thirtieth' => '30th',
+      'fourtieth' => '40th',
+      'fiftieth' => '50th',
+      'sixtieth' => '60th',
+      'seventieth' => '70th',
+      'eightieth' => '80th',
+      'ninetieth' => '90th',
+      'hundredth' => '100th',
+      'thousandth' => '1000th',
+      'millionth' => '1000000th',
+      'billionth' => '1000000000th',
+      'trillionth' => '1000000000000th',
       'twenty third' => '23rd',
       'first day month two' => '1st day month 2'
     }.each do |key, val|
       # Use pre_normalize here instead of Numerizer directly because
       # pre_normalize deals with parsing 'second' appropriately
-      assert_equal val, Chronic.pre_normalize(key)
+      assert_equal val, Chronic::Parser.new.pre_normalize(key)
     end
   end
 

data/test/test_parsing.rb

@@ -9,11 +9,21 @@ class TestParsing < TestCase
   end
 
   def test_handle_generic
-    time = Chronic.parse("2012-08-02T12:00:00+01:00")
-    assert_equal Time.local(2012, 8, 2, 12), time
+    time = Chronic.parse("2012-08-02T13:00:00")
+    assert_equal Time.local(2012, 8, 2, 13), time
+
+    time = Chronic.parse("2012-08-02T13:00:00+01:00")
+    assert_equal Time.utc(2012, 8, 2, 12), time
+
+    time = Chronic.parse("2012-08-02T08:00:00-04:00")
+    assert_equal Time.utc(2012, 8, 2, 12), time
 
     time = Chronic.parse("2012-08-02T12:00:00Z")
     assert_equal Time.utc(2012, 8, 2, 12), time
+
+    time = Chronic.parse("2012-01-03 01:00:00.100")
+    time2 = Time.parse("2012-01-03 01:00:00.100")
+    assert_equal time, time2
   end
 
   def test_handle_rmn_sd
@@ -23,9 +33,15 @@ class TestParsing < TestCase
     time = parse_now("aug 3", :context => :past)
     assert_equal Time.local(2006, 8, 3, 12), time
 
+    time = parse_now("aug. 3")
+    assert_equal Time.local(2006, 8, 3, 12), time
+
     time = parse_now("aug 20")
     assert_equal Time.local(2006, 8, 20, 12), time
 
+    time = parse_now("aug-20")
+    assert_equal Time.local(2006, 8, 20, 12), time
+
     time = parse_now("aug 20", :context => :future)
     assert_equal Time.local(2006, 8, 20, 12), time
 
@@ -98,6 +114,12 @@ class TestParsing < TestCase
     time = parse_now("22 February")
     assert_equal Time.local(2007, 2, 22, 12), time
 
+    time = parse_now("22 feb")
+    assert_equal Time.local(2007, 2, 22, 12), time
+
+    time = parse_now("22-feb")
+    assert_equal Time.local(2007, 2, 22, 12), time
+
     time = parse_now("31 of may at 6:30pm")
     assert_equal Time.local(2007, 5, 31, 18, 30), time
 
@@ -182,6 +204,9 @@ class TestParsing < TestCase
 
     time = parse_now("may 27 32")
     assert_equal Time.local(2032, 5, 27, 12, 0, 0), time
+
+    time = parse_now("oct 5 2012 1045pm")
+    assert_equal Time.local(2012, 10, 5, 22, 45), time
   end
 
   def test_handle_rmn_od_sy
@@ -302,19 +327,29 @@ class TestParsing < TestCase
 
   def test_handle_sm_sd
     time = parse_now("05/06")
-    assert_equal Time.local(2006, 5, 6, 12), time
+    assert_equal Time.local(2007, 5, 6, 12), time
 
     time = parse_now("05/06", :endian_precedence => [:little, :medium])
-    assert_equal Time.local(2006, 6, 5, 12), time
+    assert_equal Time.local(2007, 6, 5, 12), time
 
     time = parse_now("05/06 6:05:57 PM")
-    assert_equal Time.local(2006, 5, 6, 18, 05, 57), time
+    assert_equal Time.local(2007, 5, 6, 18, 05, 57), time
 
     time = parse_now("05/06 6:05:57 PM", :endian_precedence => [:little, :medium])
-    assert_equal Time.local(2006, 6, 5, 18, 05, 57), time
+    assert_equal Time.local(2007, 6, 5, 18, 05, 57), time
+
+    time = parse_now("13/09")
+    assert_equal Time.local(2006, 9, 13, 12), time
 
-    time = parse_now("13/01")
-    assert_equal Time.local(2006, 1, 13, 12), time
+    # future
+    time = parse_now("05/06") # future is default context
+    assert_equal Time.local(2007, 5, 6, 12), time
+
+    time = parse_now("1/13", :context => :future)
+    assert_equal Time.local(2007, 1, 13, 12), time
+
+    time = parse_now("3/13", :context => :none)
+    assert_equal Time.local(2006, 3, 13, 12), time
   end
 
   # def test_handle_sm_sy
@@ -328,12 +363,26 @@ class TestParsing < TestCase
   #   assert_equal nil, time
   # end
 
+  def test_handle_sy_sm
+    time = parse_now("2012-06")
+    assert_equal Time.local(2012, 06, 16), time
+
+    time = parse_now("2013/11")
+    assert_equal Time.local(2013, 11, 16), time
+  end
+
   def test_handle_r
     time = parse_now("9am on Saturday")
     assert_equal Time.local(2006, 8, 19, 9), time
 
     time = parse_now("on Tuesday")
     assert_equal Time.local(2006, 8, 22, 12), time
+
+    time = parse_now("1:00:00 PM")
+    assert_equal Time.local(2006, 8, 16, 13), time
+
+    time = parse_now("01:00:00 PM")
+    assert_equal Time.local(2006, 8, 16, 13), time
   end
 
   def test_handle_r_g_r
@@ -402,6 +451,9 @@ class TestParsing < TestCase
   def test_handle_sm_rmn_sy
     time = parse_now('30-Mar-11')
     assert_equal Time.local(2011, 3, 30, 12), time
+
+    time = parse_now('31-Aug-12')
+    assert_equal Time.local(2012, 8, 31), time
   end
 
   # end of testing handlers
@@ -834,6 +886,16 @@ class TestParsing < TestCase
 
     time = Chronic.parse("2 months ago", :now => Time.parse("2007-03-07 23:30"))
     assert_equal Time.local(2007, 1, 7, 23, 30), time
+
+    # Two repeaters
+    time = parse_now("25 minutes and 20 seconds from now")
+    assert_equal Time.local(2006, 8, 16, 14, 25, 20), time
+
+    time = parse_now("24 hours and 20 minutes from now")
+    assert_equal Time.local(2006, 8, 17, 14, 20, 0), time
+
+    time = parse_now("24 hours 20 minutes from now")
+    assert_equal Time.local(2006, 8, 17, 14, 20, 0), time
   end
 
   def test_parse_guess_p_s_r
@@ -923,6 +985,27 @@ class TestParsing < TestCase
     assert_equal parse_now("second monday in january"), parse_now("2nd monday in january")
   end
 
+  def test_relative_to_an_hour_before
+    # example prenormalization "10 to 2" becomes "10 minutes past 2"
+    assert_equal Time.local(2006, 8, 16, 13, 50), parse_now("10 to 2")
+    assert_equal Time.local(2006, 8, 16, 13, 50), parse_now("10 till 2")
+    assert_equal Time.local(2006, 8, 16, 13, 50), parse_now("10 prior to 2")
+    assert_equal Time.local(2006, 8, 16, 13, 50), parse_now("10 before 2")
+
+    # uses the current hour, so 2006-08-16 13:50:00, not 14:50
+    assert_equal Time.local(2006, 8, 16, 13, 50), parse_now("10 to")
+    assert_equal Time.local(2006, 8, 16, 13, 50), parse_now("10 till")
+
+    assert_equal Time.local(2006, 8, 16, 15, 45), parse_now("quarter to 4")
+  end
+
+  def test_relative_to_an_hour_after
+    # not nil
+    assert_equal Time.local(2006, 8, 16, 14, 10), parse_now("10 after 2")
+    assert_equal Time.local(2006, 8, 16, 14, 10), parse_now("10 past 2")
+    assert_equal Time.local(2006, 8, 16, 14, 30), parse_now("half past 2")
+  end
+
   def test_parse_only_complete_pointers
     assert_equal parse_now("eat pasty buns today at 2pm"), @time_2006_08_16_14_00_00
     assert_equal parse_now("futuristically speaking today at 2pm"), @time_2006_08_16_14_00_00
@@ -939,16 +1022,6 @@ class TestParsing < TestCase
     assert_equal Time.local(2006, 8, 16, 18, 30), parse_now("8/16/2006 at 6:30p")
   end
 
-  def test_argument_validation
-    assert_raises(ArgumentError) do
-      time = Chronic.parse("may 27", :foo => :bar)
-    end
-
-    assert_raises(ArgumentError) do
-      time = Chronic.parse("may 27", :context => :bar)
-    end
-  end
-
   def test_seasons
     t = parse_now("this spring", :guess => false)
     assert_equal Time.local(2007, 3, 20), t.begin
@@ -1019,6 +1092,38 @@ class TestParsing < TestCase
     assert_equal Time.local(2006, 12, 31, 12), time
   end
 
+  def test_handle_rdn_rmn_sd_rt
+    time = parse_now("Thu Aug 10 4pm")
+    assert_equal Time.local(2006, 8, 10, 16), time
+
+    time = parse_now("Thu Aug 10 at 4pm")
+    assert_equal Time.local(2006, 8, 10, 16), time
+  end
+
+  def test_handle_rdn_rmn_od_rt
+    time = parse_now("Thu Aug 10th at 4pm")
+    assert_equal Time.local(2006, 8, 10, 16), time
+  end
+
+  def test_handle_rdn_od_rt
+    time = parse_now("Thu 17th at 4pm")
+    assert_equal Time.local(2006, 8, 17, 16), time
+
+    time = parse_now("Thu 16th at 4pm")
+    assert_equal Time.local(2006, 8, 16, 16), time
+
+    time = parse_now("Thu 1st at 4pm")
+    assert_equal Time.local(2006, 9, 1, 16), time
+
+    time = parse_now("Thu 1st at 4pm", :context => :past)
+    assert_equal Time.local(2006, 8, 1, 16), time
+  end
+
+  def test_handle_rdn_od
+    time = parse_now("Thu 17th")
+    assert_equal Time.local(2006, 8, 17, 12), time
+  end
+
   def test_handle_rdn_rmn_sd_sy
     time = parse_now("Thu Aug 10 2006")
     assert_equal Time.local(2006, 8, 10, 12), time
@@ -1044,8 +1149,15 @@ class TestParsing < TestCase
     assert_equal Time.local(2006, 12, 31, 12), time
   end
 
+  def test_normalizing_day_portions
+    assert_equal pre_normalize("8:00 pm February 11"), pre_normalize("8:00 p.m. February 11")
+  end
+
   private
   def parse_now(string, options={})
     Chronic.parse(string, {:now => TIME_2006_08_16_14_00_00 }.merge(options))
   end
+  def pre_normalize(s)
+    Chronic::Parser.new.pre_normalize s
+  end
 end

data/test/test_span.rb

@@ -9,7 +9,7 @@ class TestSpan < TestCase
 
   def test_span_width
     span = Chronic::Span.new(Time.local(2006, 8, 16, 0), Time.local(2006, 8, 17, 0))
-    assert_equal (60 * 60 * 24), span.width
+    assert_equal((60 * 60 * 24), span.width)
   end
 
   def test_span_math

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Chronic is a natural language date/time parser written in pure Ruby.
@@ -56,19 +51,20 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
+- .travis.yml
 - HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
 - chronic.gemspec
 - lib/chronic.rb
-- lib/chronic/chronic.rb
 - lib/chronic/grabber.rb
 - lib/chronic/handler.rb
 - lib/chronic/handlers.rb
 - lib/chronic/mini_date.rb
 - lib/chronic/numerizer.rb
 - lib/chronic/ordinal.rb
+- lib/chronic/parser.rb
 - lib/chronic/pointer.rb
 - lib/chronic/repeater.rb
 - lib/chronic/repeaters/repeater_day.rb
@@ -118,28 +114,27 @@ files:
 - test/test_token.rb
 homepage: http://github.com/mojombo/chronic
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: chronic
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Natural language date/time parsing.
 test_files:
 - test/helper.rb