chronic 0.4.1 → 0.6.0

data/test/test_Chronic.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestChronic < Test::Unit::TestCase
 
@@ -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,98 @@ 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(ArgumentError) do
+      Chronic.definitions(:endian_precedence => :invalid)
+    end
+  end
+
+  def test_passing_options
+    assert_raises(ArgumentError) do
+      Chronic.parse('now', :invalid => :option)
+    end
+
+    assert_raises(ArgumentError) 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
+
+  # Chronic.construct
+
+  def test_normal
+    assert_equal Time.local(2006, 1, 2, 0, 0, 0), Chronic.construct(2006, 1, 2, 0, 0, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 0, 0), Chronic.construct(2006, 1, 2, 3, 0, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 4, 0), Chronic.construct(2006, 1, 2, 3, 4, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 4, 5), Chronic.construct(2006, 1, 2, 3, 4, 5)
+  end
+
+  def test_second_overflow
+    assert_equal Time.local(2006, 1, 1, 0, 1, 30), Chronic.construct(2006, 1, 1, 0, 0, 90)
+    assert_equal Time.local(2006, 1, 1, 0, 5, 0), Chronic.construct(2006, 1, 1, 0, 0, 300)
+  end
+
+  def test_minute_overflow
+    assert_equal Time.local(2006, 1, 1, 1, 30), Chronic.construct(2006, 1, 1, 0, 90)
+    assert_equal Time.local(2006, 1, 1, 5), Chronic.construct(2006, 1, 1, 0, 300)
+  end
+
+  def test_hour_overflow
+    assert_equal Time.local(2006, 1, 2, 12), Chronic.construct(2006, 1, 1, 36)
+    assert_equal Time.local(2006, 1, 7), Chronic.construct(2006, 1, 1, 144)
+  end
+
+  def test_day_overflow
+    assert_equal Time.local(2006, 2, 1), Chronic.construct(2006, 1, 32)
+    assert_equal Time.local(2006, 3, 5), Chronic.construct(2006, 2, 33)
+    assert_equal Time.local(2004, 3, 4), Chronic.construct(2004, 2, 33)
+    assert_equal Time.local(2000, 3, 4), Chronic.construct(2000, 2, 33)
+
+    assert_nothing_raised do
+      Chronic.construct(2006, 1, 56)
+    end
+
+    assert_raise(RuntimeError) do
+      Chronic.construct(2006, 1, 57)
+    end
+  end
+
+  def test_month_overflow
+    assert_equal Time.local(2006, 1), Chronic.construct(2005, 13)
+    assert_equal Time.local(2005, 12), Chronic.construct(2000, 72)
+  end
+
 end

data/test/test_DaylightSavings.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestDaylightSavings < Test::Unit::TestCase
 

data/test/test_Handler.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestHandler < Test::Unit::TestCase
 
@@ -101,9 +101,4 @@ class TestHandler < Test::Unit::TestCase
     assert handler.match(tokens, Chronic.definitions)
   end
 
-  def test_constantize
-    handler = Chronic::Handler.new([], :handler)
-    assert_equal Chronic::RepeaterTime, handler.constantize(:repeater_time)
-  end
-
 end

data/test/test_MiniDate.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestMiniDate < Test::Unit::TestCase
   def test_valid_month
-    assert_raise(Chronic::InvalidArgumentException){ Chronic::MiniDate.new(0,12) }
-    assert_raise(Chronic::InvalidArgumentException){ Chronic::MiniDate.new(13,1) }
+    assert_raise(ArgumentError){ Chronic::MiniDate.new(0,12) }
+    assert_raise(ArgumentError){ Chronic::MiniDate.new(13,1) }
   end
   
   def test_is_between

data/test/test_Numerizer.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class ParseNumbersTest < Test::Unit::TestCase
 

data/test/test_RepeaterDayName.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterDayName < Test::Unit::TestCase
 

data/test/test_RepeaterFortnight.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterFortnight < Test::Unit::TestCase
 

data/test/test_RepeaterHour.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterHour < Test::Unit::TestCase
 

data/test/test_RepeaterMinute.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterMinute < Test::Unit::TestCase
 

data/test/test_RepeaterMonth.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterMonth < Test::Unit::TestCase
 
@@ -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_RepeaterMonthName.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterMonthName < Test::Unit::TestCase
 

data/test/test_RepeaterSeason.rb

@@ -0,0 +1,40 @@
+require '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_RepeaterTime.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterTime < Test::Unit::TestCase
 

data/test/test_RepeaterWeek.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterWeek < Test::Unit::TestCase
 

data/test/test_RepeaterWeekday.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterWeekday < Test::Unit::TestCase
 

data/test/test_RepeaterWeekend.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterWeekend < Test::Unit::TestCase
 

data/test/test_RepeaterYear.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestRepeaterYear < Test::Unit::TestCase
 
@@ -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_Span.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestSpan < Test::Unit::TestCase
 

data/test/test_Token.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestToken < Test::Unit::TestCase