chronic 0.4.1 → 0.5.0

data/test/test_Chronic.rb

@@ -21,7 +21,7 @@ class TestChronic < Test::Unit::TestCase
 
     assert_equal :morning, tokens[1].tags[0].type
 
-    tokens = Chronic.dealias_and_disambiguate_times(tokens, {})
+    tokens = Chronic::Handlers.dealias_and_disambiguate_times(tokens, {})
 
     assert_equal :am, tokens[1].tags[0].type
     assert_equal 2, tokens.size
@@ -34,7 +34,7 @@ class TestChronic < Test::Unit::TestCase
 
     assert_equal :morning, tokens[1].tags[0].type
 
-    tokens = Chronic.dealias_and_disambiguate_times(tokens, {})
+    tokens = Chronic::Handlers.dealias_and_disambiguate_times(tokens, {})
 
     assert_equal :morning, tokens[1].tags[0].type
     assert_equal 2, tokens.size
@@ -51,4 +51,54 @@ class TestChronic < Test::Unit::TestCase
     assert_equal Time.local(2006, 11, 16), Chronic.guess(span)
   end
 
+  def test_now
+    Chronic.parse('now', :now => Time.local(2006, 01))
+    assert_equal Time.local(2006, 01), Chronic.now
+
+    Chronic.parse('now', :now => Time.local(2007, 01))
+    assert_equal Time.local(2007, 01), Chronic.now
+  end
+
+  def test_endian_definitions
+    # middle, little
+    endians = [
+      Chronic::Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_day, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
+      Chronic::Handler.new([:scalar_day, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy)
+    ]
+
+    assert_equal endians, Chronic.definitions[:endian]
+
+    defs = Chronic.definitions(:endian_precedence => :little)
+    assert_equal endians.reverse, defs[:endian]
+
+    defs = Chronic.definitions(:endian_precedence => [:little, :middle])
+    assert_equal endians.reverse, defs[:endian]
+
+    assert_raises(Chronic::InvalidArgumentException) do
+      Chronic.definitions(:endian_precedence => :invalid)
+    end
+  end
+
+  def test_passing_options
+    assert_raises(Chronic::InvalidArgumentException) do
+      Chronic.parse('now', :invalid => :option)
+    end
+
+    assert_raises(Chronic::InvalidArgumentException) do
+      Chronic.parse('now', :context => :invalid_context)
+    end
+  end
+
+  def test_debug
+    require 'stringio'
+    $stdout = StringIO.new
+    Chronic.debug = true
+
+    Chronic.parse 'now'
+    assert $stdout.string.include?('this(grabber-this)')
+  ensure
+    $stdout = STDOUT
+    Chronic.debug = false
+  end
+
 end

data/test/test_RepeaterMonth.rb

@@ -23,6 +23,10 @@ class TestRepeaterMonth < Test::Unit::TestCase
 
     time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 10, :past)
     assert_equal Time.local(2005, 10, 16, 14), time
+
+    time = Chronic::RepeaterMonth.new(:month).offset_by(Time.local(2010, 3, 29), 1, :past)
+    assert_equal 2, time.month
+    assert_equal 28, time.day
   end
 
   def test_offset

data/test/test_RepeaterSeason.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+class TestRepeaterSeason < Test::Unit::TestCase
+
+  def setup
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_next_future
+    seasons = Chronic::RepeaterSeason.new(:season)
+    seasons.start = @now
+
+    next_season = seasons.next(:future)
+    assert_equal Time.local(2006, 9, 23), next_season.begin
+    assert_equal Time.local(2006, 12, 21), next_season.end
+  end
+
+  def test_next_past
+    seasons = Chronic::RepeaterSeason.new(:season)
+    seasons.start = @now
+
+    last_season = seasons.next(:past)
+    assert_equal Time.local(2006, 3, 20), last_season.begin
+    assert_equal Time.local(2006, 6, 20), last_season.end
+  end
+
+  def test_this
+    seasons = Chronic::RepeaterSeason.new(:season)
+    seasons.start = @now
+
+    this_season = seasons.this(:future)
+    assert_equal Time.local(2006, 8, 17), this_season.begin
+    assert_equal Time.local(2006, 9, 22), this_season.end
+
+    this_season = seasons.this(:past)
+    assert_equal Time.local(2006, 6, 21), this_season.begin
+    assert_equal Time.local(2006, 8, 16), this_season.end
+  end
+
+end

data/test/test_RepeaterYear.rb

@@ -57,6 +57,13 @@ class TestRepeaterYear < Test::Unit::TestCase
 
     assert_equal Time.local(1996, 8, 16, 14), offset_span.begin
     assert_equal Time.local(1996, 8, 16, 14, 0, 1), offset_span.end
+
+    now = Time.local(2008, 2, 29)
+    span = Chronic::Span.new(now, now + 1)
+    offset_span = Chronic::RepeaterYear.new(:year).offset(span, 1, :past)
+
+    assert_equal Time.local(2007, 2, 28), offset_span.begin
+    assert_equal Time.local(2007, 2, 28, 0, 0, 1), offset_span.end
   end
 
 end

data/test/test_Time.rb

@@ -31,7 +31,7 @@ class TestTime < Test::Unit::TestCase
     assert_equal Time.local(2006, 2, 1), Time.construct(2006, 1, 32)
     assert_equal Time.local(2006, 3, 5), Time.construct(2006, 2, 33)
     assert_equal Time.local(2004, 3, 4), Time.construct(2004, 2, 33)
-    assert_equal Time.local(2000, 3, 5), Time.construct(2000, 2, 33)
+    assert_equal Time.local(2000, 3, 4), Time.construct(2000, 2, 33)
 
     assert_nothing_raised do
       Time.construct(2006, 1, 56)

data/test/test_parsing.rb

@@ -8,8 +8,21 @@ class TestParsing < Test::Unit::TestCase
     @time_2006_08_16_14_00_00 = TIME_2006_08_16_14_00_00
   end
 
-  def test_parse_guess_dates
-    # rm_sd
+  def test_parse_m_d
+  end
+
+  def test_handle_rmn_sd
+    time = parse_now("aug 3")
+    assert_equal Time.local(2006, 8, 3, 12), time
+
+    time = parse_now("aug 3", :context => :past)
+    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", :context => :future)
+    assert_equal Time.local(2006, 8, 20, 12), time
 
     time = parse_now("may 27")
     assert_equal Time.local(2007, 5, 27, 12), time
@@ -25,23 +38,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
+  end
 
-    # rm_sd for current month
-
-    time = parse_now("aug 3")
-    assert_equal Time.local(2006, 8, 3, 12), time
-
-    time = parse_now("aug 3", :context => :past)
-    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", :context => :future)
-    assert_equal Time.local(2006, 8, 20, 12), time
-
-    # rm_sd_on
-
+  def test_handle_rmn_sd_on
     time = parse_now("5pm on may 28")
     assert_equal Time.local(2007, 5, 28, 17), time
 
@@ -50,9 +49,9 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("5 on may 28", :ambiguous_time_range => :none)
     assert_equal Time.local(2007, 5, 28, 05), time
+  end
 
-    # rm_od
-
+  def test_handle_rmn_od
     time = parse_now("may 27th")
     assert_equal Time.local(2007, 5, 27, 12), time
 
@@ -67,9 +66,20 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("may 27th at 5", :ambiguous_time_range => :none)
     assert_equal Time.local(2007, 5, 27, 5), time
+  end
+
+  def test_handle_od_rmn
+    time = parse_now("22nd February")
+    assert_equal Time.local(2007, 2, 22, 12), time
 
-    # rm_od_on
+    time = parse_now("31st of may at 6:30pm")
+    assert_equal Time.local(2007, 5, 31, 18, 30), time
 
+    time = parse_now("11th 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
 
@@ -81,16 +91,65 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("5 on may 27th", :ambiguous_time_range => :none)
     assert_equal Time.local(2007, 5, 27, 5), time
+  end
+
+  def test_handle_rmn_sy
+    time = parse_now("may 97")
+    assert_equal Time.local(1997, 5, 16, 12), time
+
+    time = parse_now("may 33", :ambiguous_year_future_bias => 10)
+    assert_equal Time.local(2033, 5, 16, 12), time
+
+    time = parse_now("may 32")
+    assert_equal Time.local(2032, 5, 16, 12, 0, 0), time
+  end
+
+  def test_handle_rdn_rmn_sd_t_tz_sy
+    time = parse_now("Mon Apr 02 17:00:00 PDT 2007")
+    assert_equal 1175558400, time.to_i
+  end
+
+  def test_handle_rmn_sd_sy
+    time = parse_now("November 18, 2010")
+    assert_equal Time.local(2010, 11, 18, 12), time
+
+    time = parse_now("Jan 1,2010")
+    assert_equal Time.local(2010, 1, 1, 12), time
+
+    time = parse_now("February 14, 2004")
+    assert_equal Time.local(2004, 2, 14, 12), time
+
+    time = parse_now("jan 3 2010")
+    assert_equal Time.local(2010, 1, 3, 12), time
+
+    time = parse_now("jan 3 2010 midnight")
+    assert_equal Time.local(2010, 1, 4, 0), time
+
+    time = parse_now("jan 3 2010 at midnight")
+    assert_equal Time.local(2010, 1, 4, 0), time
+
+    time = parse_now("jan 3 2010 at 4", :ambiguous_time_range => :none)
+    assert_equal Time.local(2010, 1, 3, 4), time
+
+    time = parse_now("may 27, 1979")
+    assert_equal Time.local(1979, 5, 27, 12), time
+
+    time = parse_now("may 27 79")
+    assert_equal Time.local(1979, 5, 27, 12), time
 
-    # rm_sy
+    time = parse_now("may 27 79 4:30")
+    assert_equal Time.local(1979, 5, 27, 16, 30), time
 
-    time = parse_now("June 1979")
-    assert_equal Time.local(1979, 6, 16, 0), time
+    time = parse_now("may 27 79 at 4:30", :ambiguous_time_range => :none)
+    assert_equal Time.local(1979, 5, 27, 4, 30), time
 
-    time = parse_now("dec 79")
-    assert_equal Time.local(1979, 12, 16, 12), time
+    time = parse_now("may 27 32")
+    assert_equal Time.local(2032, 5, 27, 12, 0, 0), time
+  end
 
-    # rm_od_sy
+  def test_handle_rmn_od_sy
+    time = parse_now("may 1st 01")
+    assert_equal Time.local(2001, 5, 1, 12), time
 
     time = parse_now("November 18th 2010")
     assert_equal Time.local(2010, 11, 18, 12), time
@@ -121,44 +180,17 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("March 30th 79 at 4:30", :ambiguous_time_range => :none)
     assert_equal Time.local(1979, 3, 30, 4, 30), time
+  end
 
-    # rm_sd_sy
-
-    time = parse_now("November 18, 2010")
-    assert_equal Time.local(2010, 11, 18, 12), time
-
-    time = parse_now("February 14, 2004")
-    assert_equal Time.local(2004, 2, 14, 12), time
-
-    time = parse_now("jan 3 2010")
-    assert_equal Time.local(2010, 1, 3, 12), time
-
-    time = parse_now("jan 3 2010 midnight")
-    assert_equal Time.local(2010, 1, 4, 0), time
-
-    time = parse_now("jan 3 2010 at midnight")
-    assert_equal Time.local(2010, 1, 4, 0), time
-
-    time = parse_now("jan 3 2010 at 4", :ambiguous_time_range => :none)
-    assert_equal Time.local(2010, 1, 3, 4), time
-
-    #time = parse_now("January 12, '00")
-    #assert_equal Time.local(2000, 1, 12, 12), time
-
-    time = parse_now("may 27, 1979")
-    assert_equal Time.local(1979, 5, 27, 12), time
-
-    time = parse_now("may 27 79")
-    assert_equal Time.local(1979, 5, 27, 12), time
-
-    time = parse_now("may 27 79 4:30")
-    assert_equal Time.local(1979, 5, 27, 16, 30), time
-
-    time = parse_now("may 27 79 at 4:30", :ambiguous_time_range => :none)
-    assert_equal Time.local(1979, 5, 27, 4, 30), time
+  def test_handle_od_rmn_sy
+    time = parse_now("22nd February 2012")
+    assert_equal Time.local(2012, 2, 22, 12), time
 
-    # sd_rm_sy
+    time = parse_now("11th december 79")
+    assert_equal Time.local(1979, 12, 11, 12), time
+  end
 
+  def test_handle_sd_rmn_sy
     time = parse_now("3 jan 2010")
     assert_equal Time.local(2010, 1, 3, 12), time
 
@@ -167,36 +199,25 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("27 Oct 2006 7:30pm")
     assert_equal Time.local(2006, 10, 27, 19, 30), time
+  end
 
-    # sm_sd_sy
-
+  def test_handle_sm_sd_sy
     time = parse_now("5/27/1979")
     assert_equal Time.local(1979, 5, 27, 12), time
 
     time = parse_now("5/27/1979 4am")
     assert_equal Time.local(1979, 5, 27, 4), time
+  end
 
-    # sd_sm_sy
-
+  def test_handle_sd_sm_sy
     time = parse_now("27/5/1979")
     assert_equal Time.local(1979, 5, 27, 12), time
 
     time = parse_now("27/5/1979 @ 0700")
     assert_equal Time.local(1979, 5, 27, 7), time
+  end
 
-    # 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
-
-    # sy_sm_sd
-
+  def test_handle_sy_sm_sd
     time = parse_now("2000-1-1")
     assert_equal Time.local(2000, 1, 1, 12), time
 
@@ -218,43 +239,73 @@ 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
 
-    # rdn_rm_rd_rt_rtz_ry
+    time = parse_now("1902-08-20")
+    assert_equal Time.local(1902, 8, 20, 12, 0, 0), time
+  end
 
-    time = parse_now("Mon Apr 02 17:00:00 PDT 2007")
-    assert_equal 1175558400, time.to_i
+  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
 
-    now = Time.now
-    time = parse_now(now.to_s)
-    # assert_equal now.to_s, time.to_s
+  def test_handle_r
+  end
 
-    # rm_sd_rt
+  def test_handle_r_g_r
+  end
 
-    #time = parse_now("jan 5 13:00")
-    #assert_equal Time.local(2007, 1, 5, 13), time
+  def test_handle_srp
+  end
 
-    # old dates
+  def test_handle_s_r_p
+  end
 
-    time = parse_now("may 40")
-    assert_equal Time.local(2040, 5, 16, 12, 0, 0), time
+  def test_handle_p_s_r
+  end
 
-    time = parse_now("may 27 40")
-    assert_equal Time.local(2040, 5, 27, 12, 0, 0), time
+  def test_handle_s_r_p_a
+  end
 
-    time = parse_now("1800-08-20")
-    assert_equal Time.local(1800, 8, 20, 12, 0, 0), time
+  def test_handle_orr
   end
 
-  def test_parse_two_digit_years
-    time = parse_now("may 97")
-    assert_equal Time.local(1997, 5, 16, 12), time
+  def test_handle_o_r_s_r
+    time = parse_now("3rd wednesday in november")
+    assert_equal Time.local(2006, 11, 15, 12), time
 
-    time = parse_now("may 1st 01")
-    assert_equal Time.local(2001, 5, 1, 12), time
+    time = parse_now("10th wednesday in november")
+    assert_equal nil, time
+
+    # time = parse_now("3rd wednesday in 2007")
+    # assert_equal Time.local(2007, 1, 20, 12), time
+  end
+
+  def test_handle_o_r_g_r
+    time = parse_now("3rd month next year", :guess => false)
+    assert_equal Time.local(2007, 3), time.begin
+
+    time = parse_now("3rd month next year", :guess => false)
+    assert_equal Time.local(2007, 3, 1), time.begin
+
+    time = parse_now("3rd thursday this september")
+    assert_equal Time.local(2006, 9, 21, 12), time
+
+    now = Time.parse("1/10/2010")
+    time = parse_now("3rd thursday this november", :now => now)
+    assert_equal Time.local(2010, 11, 18, 12), time
 
-    time = parse_now("may 79", :ambiguous_year_future_bias => 10)
-    assert_equal Time.local(2079, 5, 16, 12), time
+    time = parse_now("4th day last week")
+    assert_equal Time.local(2006, 8, 9, 12), time
   end
 
+  # end of testing handlers
+
   def test_parse_guess_r
     time = parse_now("friday")
     assert_equal Time.local(2006, 8, 18, 12), time
@@ -274,6 +325,12 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("13:45")
     assert_equal Time.local(2006, 8, 17, 13, 45), time
 
+    time = parse_now("1:01pm")
+    assert_equal Time.local(2006, 8, 16, 13, 01), time
+
+    time = parse_now("2:01pm")
+    assert_equal Time.local(2006, 8, 16, 14, 01), time
+
     time = parse_now("november")
     assert_equal Time.local(2006, 11, 16), time
   end
@@ -643,17 +700,6 @@ class TestParsing < Test::Unit::TestCase
     # future
   end
 
-  def test_parse_guess_o_r_s_r
-    time = parse_now("3rd wednesday in november")
-    assert_equal Time.local(2006, 11, 15, 12), time
-
-    time = parse_now("10th wednesday in november")
-    assert_equal nil, time
-
-    # time = parse_now("3rd wednesday in 2007")
-    # assert_equal Time.local(2007, 1, 20, 12), time
-  end
-
   def test_parse_guess_o_r_g_r
     time = parse_now("3rd month next year", :guess => false)
     assert_equal Time.local(2007, 3), time.begin

metadata

@@ -1,38 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chronic
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Tom Preston-Werner
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-05 00:00:00 Z
+date: 2011-07-01 00:00:00.000000000 +01:00
+default_executable: 
 dependencies: []
-
 description: Chronic is a natural language date/time parser written in pure Ruby.
-email: 
+email:
 - tom@mojombo.com
 - lee@jarvis.co
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - HISTORY.md
 - LICENSE
-files: 
+files:
+- .gemtest
+- .gitignore
+- .yardopts
 - HISTORY.md
 - LICENSE
 - Manifest.txt
 - README.md
 - Rakefile
-- benchmark/benchmark.rb
 - chronic.gemspec
 - lib/chronic.rb
 - lib/chronic/chronic.rb
@@ -60,6 +59,7 @@ files:
 - lib/chronic/repeaters/repeater_weekend.rb
 - lib/chronic/repeaters/repeater_year.rb
 - lib/chronic/scalar.rb
+- lib/chronic/season.rb
 - lib/chronic/separator.rb
 - lib/chronic/span.rb
 - lib/chronic/tag.rb
@@ -77,6 +77,7 @@ files:
 - test/test_RepeaterMinute.rb
 - test/test_RepeaterMonth.rb
 - test/test_RepeaterMonthName.rb
+- test/test_RepeaterSeason.rb
 - test/test_RepeaterTime.rb
 - test/test_RepeaterWeek.rb
 - test/test_RepeaterWeekday.rb
@@ -86,34 +87,34 @@ files:
 - test/test_Time.rb
 - test/test_Token.rb
 - test/test_parsing.rb
+has_rdoc: true
 homepage: http://github.com/mojombo/chronic
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: chronic
-rubygems_version: 1.8.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Natural language date/time parsing.
-test_files: 
+test_files:
+- test/helper.rb
 - test/test_Chronic.rb
 - test/test_DaylightSavings.rb
 - test/test_Handler.rb
@@ -125,6 +126,7 @@ test_files:
 - test/test_RepeaterMinute.rb
 - test/test_RepeaterMonth.rb
 - test/test_RepeaterMonthName.rb
+- test/test_RepeaterSeason.rb
 - test/test_RepeaterTime.rb
 - test/test_RepeaterWeek.rb
 - test/test_RepeaterWeekday.rb

data/benchmark/benchmark.rb

@@ -1,13 +0,0 @@
-require 'chronic'
-require 'benchmark'
-
-print "jan 3 2010:                          "
-puts Benchmark.measure { Chronic.parse("jan 3 2010") }
-
-print "7 hours before tomorrow at midnight: "
-puts Benchmark.measure { Chronic.parse("7 hours before tomorrow at midnight") }
-
-# n = 100
-# Benchmark.bm(14) do |x|
-#   x.report("jan 3 2010:")   { for i in 1..n; Chronic.parse("jan 3 2010"); end }
-# end