chronic 0.6.3 → 0.10.2

data/test/test_parsing.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestParsing < Test::Unit::TestCase
+class TestParsing < 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)
 
@@ -8,6 +8,37 @@ class TestParsing < Test::Unit::TestCase
     @time_2006_08_16_14_00_00 = TIME_2006_08_16_14_00_00
   end
 
+  def test_handle_generic
+    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("2013-08-01T19:30:00.345-07:00")
+    time2 = Time.parse("2013-08-01 019:30:00.345-07:00")
+    assert_in_delta time, time2, 0.001
+
+    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_in_delta time, time2, 0.001
+
+    time = Chronic.parse("2012-01-03 01:00:00.234567")
+    time2 = Time.parse("2012-01-03 01:00:00.234567")
+    assert_in_delta time, time2, 0.000001
+
+    assert_nil Chronic.parse("1/1/32.1")
+
+    time = Chronic.parse("28th", {:guess => :begin})
+    assert_equal Time.new(Time.now.year, Time.now.month, 28), time
+  end
+
   def test_handle_rmn_sd
     time = parse_now("aug 3")
     assert_equal Time.local(2006, 8, 3, 12), time
@@ -15,9 +46,15 @@ class TestParsing < Test::Unit::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
 
@@ -35,6 +72,9 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("may 28 at 5:32.19pm", :context => :past)
     assert_equal Time.local(2006, 5, 28, 17, 32, 19), time
+
+    time = parse_now("may 28 at 5:32:19.764")
+    assert_in_delta Time.local(2007, 5, 28, 17, 32, 19, 764000), time, 0.001
   end
 
   def test_handle_rmn_sd_on
@@ -65,6 +105,11 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2007, 5, 27, 5), time
   end
 
+  def test_handle_od_rm
+    time = parse_now("fifteenth of this month")
+    assert_equal Time.local(2006, 8, 15, 12), time
+  end
+
   def test_handle_od_rmn
     time = parse_now("22nd February")
     assert_equal Time.local(2007, 2, 22, 12), time
@@ -76,6 +121,28 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 12, 11, 8), time
   end
 
+  def test_handle_sy_rmn_od
+    time = parse_now("2009 May 22nd")
+    assert_equal Time.local(2009, 05, 22, 12), time
+  end
+
+  def test_handle_sd_rmn
+    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
+
+    time = parse_now("11 december 8am")
+    assert_equal Time.local(2006, 12, 11, 8), time
+  end
+
   def test_handle_rmn_od_on
     time = parse_now("5:00 pm may 27th", :context => :past)
     assert_equal Time.local(2006, 5, 27, 17), time
@@ -113,8 +180,14 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("2011-07-03 22:11:35 +01:00")
     assert_equal 1309727495, time.to_i
 
+    time = parse_now("2011-07-03 16:11:35 -05:00")
+    assert_equal 1309727495, time.to_i
+
     time = parse_now("2011-07-03 21:11:35 UTC")
     assert_equal 1309727495, time.to_i
+
+    time = parse_now("2011-07-03 21:11:35.362 UTC")
+    assert_in_delta 1309727495.362, time.to_f, 0.001
   end
 
   def test_handle_rmn_sd_sy
@@ -153,6 +226,9 @@ class TestParsing < Test::Unit::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
@@ -222,9 +298,15 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("7/12/11", :endian_precedence => :little)
     assert_equal Time.local(2011, 12, 7, 12), time
 
+    time = parse_now("9/19/2011 6:05:57 PM")
+    assert_equal Time.local(2011, 9, 19, 18, 05, 57), time
+
     # month day overflows
     time = parse_now("30/2/2000")
     assert_nil time
+
+    time = parse_now("2013-03-12 17:00", :context => :past)
+    assert_equal Time.local(2013, 3, 12, 17, 0, 0), time
   end
 
   def test_handle_sd_sm_sy
@@ -233,6 +315,18 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("27/5/1979 @ 0700")
     assert_equal Time.local(1979, 5, 27, 7), time
+
+    time = parse_now("03/18/2012 09:26 pm")
+    assert_equal Time.local(2012, 3, 18, 21, 26), time
+
+    time = parse_now("30.07.2013 16:34:22")
+    assert_equal Time.local(2013, 7, 30, 16, 34, 22), time
+
+    time = parse_now("09.08.2013")
+    assert_equal Time.local(2013, 8, 9, 12), time
+
+    time = parse_now("30-07-2013 21:53:49")
+    assert_equal Time.local(2013, 7, 30, 21, 53, 49), time
   end
 
   def test_handle_sy_sm_sd
@@ -257,22 +351,96 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("2006-08-20 15:30.30")
     assert_equal Time.local(2006, 8, 20, 15, 30, 30), time
 
+    time = parse_now("2006-08-20 15:30:30:000536")
+    assert_in_delta Time.local(2006, 8, 20, 15, 30, 30, 536), time, 0.000001
+
     time = parse_now("1902-08-20")
     assert_equal Time.local(1902, 8, 20, 12, 0, 0), time
+
+    time = parse_now("2013.07.30 11:45:23")
+    assert_equal Time.local(2013, 7, 30, 11, 45, 23), time
+
+    time = parse_now("2013.08.09")
+    assert_equal Time.local(2013, 8, 9, 12, 0, 0), time
+
+    # exif date time original
+    time = parse_now("2012:05:25 22:06:50")
+    assert_equal Time.local(2012, 5, 25, 22, 6, 50), time
   end
 
-  def test_handle_sm_sy
+  def test_handle_sm_sd
     time = parse_now("05/06")
-    assert_equal Time.local(2006, 5, 16, 12), time
+    assert_equal Time.local(2007, 5, 6, 12), time
 
-    time = parse_now("12/06")
-    assert_equal Time.local(2006, 12, 16, 12), time
+    time = parse_now("05/06", :endian_precedence => [:little, :medium])
+    assert_equal Time.local(2007, 6, 5, 12), time
 
-    time = parse_now("13/06")
-    assert_equal nil, time
+    time = parse_now("05/06 6:05:57 PM")
+    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(2007, 6, 5, 18, 05, 57), time
+
+    time = parse_now("13/09")
+    assert_equal Time.local(2006, 9, 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
+  #   time = parse_now("05/06")
+  #   assert_equal Time.local(2006, 5, 16, 12), time
+  #
+  #   time = parse_now("12/06")
+  #   assert_equal Time.local(2006, 12, 16, 12), time
+  #
+  #   time = parse_now("13/06")
+  #   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/12")
+    assert_equal Time.local(2013, 12, 16, 12, 0), 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
+
+    time = parse_now("today at 02:00:00", :hours24 => false)
+    assert_equal Time.local(2006, 8, 16, 14), time
+
+    time = parse_now("today at 02:00:00 AM", :hours24 => false)
+    assert_equal Time.local(2006, 8, 16, 2), time
+
+    time = parse_now("today at 3:00:00", :hours24 => true)
+    assert_equal Time.local(2006, 8, 16, 3), time
+
+    time = parse_now("today at 03:00:00", :hours24 => true)
+    assert_equal Time.local(2006, 8, 16, 3), time
+
+    time = parse_now("tomorrow at 4a.m.")
+    assert_equal Time.local(2006, 8, 17, 4), time
   end
 
   def test_handle_r_g_r
@@ -288,9 +456,25 @@ class TestParsing < Test::Unit::TestCase
   end
 
   def test_handle_s_r_p_a
+    time1 = parse_now("two days ago 0:0:0am")
+    time2 = parse_now("two days ago 00:00:00am")
+    assert_equal time1, time2
   end
 
   def test_handle_orr
+    time = parse_now("5th tuesday in january")
+    assert_equal Time.local(2007, 01, 30, 12), time
+
+    time = parse_now("5th tuesday in february")
+    assert_equal nil, time
+
+    %W(jan feb march april may june july aug sep oct nov dec).each_with_index do |month, index|
+      time = parse_now("5th tuesday in #{month}")
+
+      if time then
+        assert_equal time.month, index+1
+      end
+    end
   end
 
   def test_handle_o_r_s_r
@@ -322,6 +506,14 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 8, 9, 12), time
   end
 
+  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
 
   def test_parse_guess_r
@@ -417,11 +609,11 @@ class TestParsing < Test::Unit::TestCase
   def test_parse_guess_gr
     # year
 
-    time = parse_now("this year")
-    assert_equal Time.local(2006, 10, 24, 12, 30), time
+    time = parse_now("this year", :guess => false)
+    assert_equal Time.local(2006, 8, 17), time.begin
 
-    time = parse_now("this year", :context => :past)
-    assert_equal Time.local(2006, 4, 24, 12, 30), time
+    time = parse_now("this year", :context => :past, :guess => false)
+    assert_equal Time.local(2006, 1, 1), time.begin
 
     # month
 
@@ -507,6 +699,34 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("last wed")
     assert_equal Time.local(2006, 8, 9, 12), time
 
+    monday = Time.local(2006, 8, 21, 12)
+    assert_equal monday, parse_now("mon")
+    assert_equal monday, parse_now("mun")
+
+    tuesday = Time.local(2006, 8, 22, 12)
+    assert_equal tuesday, parse_now("tue")
+    assert_equal tuesday, parse_now("tus")
+
+    wednesday = Time.local(2006, 8, 23, 12)
+    assert_equal wednesday, parse_now("wed")
+    assert_equal wednesday, parse_now("wenns")
+
+    thursday = Time.local(2006, 8, 17, 12)
+    assert_equal thursday, parse_now("thu")
+    assert_equal thursday, parse_now("thur")
+
+    friday = Time.local(2006, 8, 18, 12)
+    assert_equal friday, parse_now("fri")
+    assert_equal friday, parse_now("fry")
+
+    saturday = Time.local(2006, 8, 19, 12)
+    assert_equal saturday, parse_now("sat")
+    assert_equal saturday, parse_now("satterday")
+
+    sunday = Time.local(2006, 8, 20, 12)
+    assert_equal sunday, parse_now("sun")
+    assert_equal sunday, parse_now("sum")
+
     # day portion
 
     time = parse_now("this morning")
@@ -515,13 +735,33 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("tonight")
     assert_equal Time.local(2006, 8, 16, 22), time
 
+    # hour
+
+    time = parse_now("next hr")
+    assert_equal Time.local(2006, 8, 16, 15, 30, 0), time
+
+    time = parse_now("next hrs")
+    assert_equal Time.local(2006, 8, 16, 15, 30, 0), time
+
     # minute
 
+    time = parse_now("next min")
+    assert_equal Time.local(2006, 8, 16, 14, 1, 30), time
+
+    time = parse_now("next mins")
+    assert_equal Time.local(2006, 8, 16, 14, 1, 30), time
+
     time = parse_now("next minute")
     assert_equal Time.local(2006, 8, 16, 14, 1, 30), time
 
     # second
 
+    time = parse_now("next sec")
+    assert_equal Time.local(2006, 8, 16, 14, 0, 1), time
+
+    time = parse_now("next secs")
+    assert_equal Time.local(2006, 8, 16, 14, 0, 1), time
+
     time = parse_now("this second")
     assert_equal Time.local(2006, 8, 16, 14), time
 
@@ -614,6 +854,20 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 8, 8, 12), time
   end
 
+  def test_parse_guess_a_ago
+    time = parse_now("AN hour ago")
+    assert_equal Time.local(2006, 8, 16, 13), time
+
+    time = parse_now("A day ago")
+    assert_equal Time.local(2006, 8, 15, 14), time
+
+    time = parse_now("a month ago")
+    assert_equal Time.local(2006, 7, 16, 14), time
+
+    time = parse_now("a year ago")
+    assert_equal Time.local(2005, 8, 16, 14), time
+  end
+
   def test_parse_guess_s_r_p
     # past
 
@@ -690,6 +944,16 @@ class TestParsing < Test::Unit::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
@@ -776,6 +1040,28 @@ class TestParsing < Test::Unit::TestCase
     assert_equal parse_now("33 days from now"), parse_now("thirty-three days from now")
     assert_equal parse_now("2867532 seconds from now"), parse_now("two million eight hundred and sixty seven thousand five hundred and thirty two seconds from now")
     assert_equal parse_now("may 10th"), parse_now("may tenth")
+    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
@@ -794,16 +1080,6 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 8, 16, 18, 30), parse_now("8/16/2006 at 6:30p")
   end
 
-  def test_argument_validation
-    assert_raise(ArgumentError) do
-      time = Chronic.parse("may 27", :foo => :bar)
-    end
-
-    assert_raise(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
@@ -855,11 +1131,105 @@ class TestParsing < Test::Unit::TestCase
     t1 = Chronic.parse("now")
     sleep 0.1
     t2 = Chronic.parse("now")
-    assert_not_equal t1, t2
+    refute_equal t1, t2
+  end
+
+  def test_noon
+    t1 = Chronic.parse('2011-01-01 at noon', :ambiguous_time_range => :none)
+    assert_equal Time.local(2011, 1, 1, 12, 0), t1
+  end
+
+  def test_handle_rdn_rmn_sd
+    time = parse_now("Thu Aug 10")
+    assert_equal Time.local(2006, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31")
+    assert_equal Time.local(2006, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31")
+    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
+
+    time = parse_now("Thursday July 31 2006")
+    assert_equal Time.local(2006, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31 2006")
+    assert_equal Time.local(2006, 12, 31, 12), time
+
+    time = parse_now("Thursday December 30 2006")
+    assert_equal Time.local(2006, 12, 30, 12), time
+  end
+
+  def test_handle_rdn_rmn_od
+    time = parse_now("Thu Aug 10th")
+    assert_equal Time.local(2006, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31st")
+    assert_equal Time.local(2006, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31st")
+    assert_equal Time.local(2006, 12, 31, 12), time
+  end
+
+  def test_handle_rdn_rmn_od_sy
+    time = parse_now("Thu Aug 10th 2005")
+    assert_equal Time.local(2005, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31st 2005")
+    assert_equal Time.local(2005, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31st 2005")
+    assert_equal Time.local(2005, 12, 31, 12), time
+
+    time = parse_now("Thursday December 30th 2005")
+    assert_equal Time.local(2005, 12, 30, 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_RepeaterDayName.rb → test_repeater_day_name.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRepeaterDayName < Test::Unit::TestCase
+class TestRepeaterDayName < TestCase
 
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)