chronic 0.6.5 → 0.8.0

data/test/{test_Chronic.rb → test_chronic.rb}

@@ -1,12 +1,16 @@
 require 'helper'
 
-class TestChronic < Test::Unit::TestCase
+class TestChronic < TestCase
 
   def setup
     # Wed Aug 16 14:00:00 UTC 2006
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
 
+  def test_pre_normalize
+    assert_equal Chronic.pre_normalize('12:55 pm'), Chronic.pre_normalize('12.55 pm')
+  end
+
   def test_pre_normalize_numerized_string
     string = 'two and a half years'
     assert_equal Chronic::Numerizer.numerize(string), Chronic.pre_normalize(string)
@@ -63,6 +67,8 @@ class TestChronic < Test::Unit::TestCase
     # 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_month, :separator_slash_or_dash, :scalar_day, :separator_at?, 'time?'], :handle_sm_sd),
+      Chronic::Handler.new([:scalar_day, :separator_slash_or_dash, :scalar_month, :separator_at?, 'time?'], :handle_sd_sm),
       Chronic::Handler.new([:scalar_day, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy)
     ]
 
@@ -131,11 +137,7 @@ class TestChronic < Test::Unit::TestCase
     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
+    assert_raises(RuntimeError) do
       Chronic.construct(2006, 1, 57)
     end
   end

data/test/{test_DaylightSavings.rb → test_daylight_savings.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDaylightSavings < Test::Unit::TestCase
+class TestDaylightSavings < TestCase
 
   def setup
     @begin_daylight_savings = Time.local(2008, 3, 9, 5, 0, 0, 0)

data/test/{test_Handler.rb → test_handler.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestHandler < Test::Unit::TestCase
+class TestHandler < TestCase
 
   def setup
     # Wed Aug 16 14:00:00 UTC 2006

data/test/{test_MiniDate.rb → test_mini_date.rb}

@@ -1,32 +1,32 @@
 require 'helper'
 
-class TestMiniDate < Test::Unit::TestCase
+class TestMiniDate < TestCase
   def test_valid_month
-    assert_raise(ArgumentError){ Chronic::MiniDate.new(0,12) }
-    assert_raise(ArgumentError){ Chronic::MiniDate.new(13,1) }
+    assert_raises(ArgumentError){ Chronic::MiniDate.new(0,12) }
+    assert_raises(ArgumentError){ Chronic::MiniDate.new(13,1) }
   end
-  
+
   def test_is_between
     m=Chronic::MiniDate.new(3,2)
     assert m.is_between?(Chronic::MiniDate.new(2,4), Chronic::MiniDate.new(4,7))
-    assert !m.is_between?(Chronic::MiniDate.new(1,5), Chronic::MiniDate.new(2,7))    
-    
+    assert !m.is_between?(Chronic::MiniDate.new(1,5), Chronic::MiniDate.new(2,7))
+
     #There was a hang if date tested is in december and outside the testing range
     m=Chronic::MiniDate.new(12,24)
     assert !m.is_between?(Chronic::MiniDate.new(10,1), Chronic::MiniDate.new(12,21))
   end
-  
+
   def test_is_between_short_range
     m=Chronic::MiniDate.new(5,10)
     assert m.is_between?(Chronic::MiniDate.new(5,3), Chronic::MiniDate.new(5,12))
     assert !m.is_between?(Chronic::MiniDate.new(5,11), Chronic::MiniDate.new(5,15))
   end
-  
+
   def test_is_between_wrapping_range
     m=Chronic::MiniDate.new(1,1)
     assert m.is_between?(Chronic::MiniDate.new(11,11), Chronic::MiniDate.new(2,2))
     m=Chronic::MiniDate.new(12,12)
     assert m.is_between?(Chronic::MiniDate.new(11,11), Chronic::MiniDate.new(1,5))
   end
-  
+
 end

data/test/{test_Numerizer.rb → test_numerizer.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ParseNumbersTest < Test::Unit::TestCase
+class ParseNumbersTest < TestCase
 
   def test_straight_parsing
     strings = {

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,14 @@ 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-02T12:00:00+01:00")
+    assert_equal Time.local(2012, 8, 2, 12), time
+
+    time = Chronic.parse("2012-08-02T12:00:00Z")
+    assert_equal Time.utc(2012, 8, 2, 12), time
+  end
+
   def test_handle_rmn_sd
     time = parse_now("aug 3")
     assert_equal Time.local(2006, 8, 3, 12), time
@@ -65,6 +73,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
@@ -252,6 +265,9 @@ 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
   end
 
   def test_handle_sy_sm_sd
@@ -278,20 +294,46 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("1902-08-20")
     assert_equal Time.local(1902, 8, 20, 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(2006, 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(2006, 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(2006, 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
+
+    time = parse_now("13/01")
+    assert_equal Time.local(2006, 1, 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_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
   end
 
   def test_handle_r_g_r
@@ -307,6 +349,9 @@ 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
@@ -354,6 +399,11 @@ 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
+  end
+
   # end of testing handlers
 
   def test_parse_guess_r
@@ -539,6 +589,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")
@@ -547,13 +625,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
 
@@ -646,6 +744,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
 
@@ -808,6 +920,7 @@ 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_parse_only_complete_pointers
@@ -827,11 +940,11 @@ class TestParsing < Test::Unit::TestCase
   end
 
   def test_argument_validation
-    assert_raise(ArgumentError) do
+    assert_raises(ArgumentError) do
       time = Chronic.parse("may 27", :foo => :bar)
     end
 
-    assert_raise(ArgumentError) do
+    assert_raises(ArgumentError) do
       time = Chronic.parse("may 27", :context => :bar)
     end
   end
@@ -887,7 +1000,7 @@ 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
@@ -898,11 +1011,37 @@ class TestParsing < Test::Unit::TestCase
   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_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
 
   private

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)

data/test/test_repeater_day_portion.rb

@@ -0,0 +1,254 @@
+require 'helper'
+
+class TestRepeaterDayPortion < TestCase
+
+  def setup
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+  
+  def test_am_future
+    day_portion = Chronic::RepeaterDayPortion.new(:am)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 17, 00), next_time.begin
+    assert_equal Time.local(2006, 8, 17, 11, 59, 59), next_time.end
+
+    next_next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 18, 00), next_next_time.begin
+    assert_equal Time.local(2006, 8, 18, 11, 59, 59), next_next_time.end
+  end
+
+  def test_am_past
+    day_portion = Chronic::RepeaterDayPortion.new(:am)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 16, 00), next_time.begin
+    assert_equal Time.local(2006, 8, 16, 11, 59, 59), next_time.end
+
+    next_next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 15, 00), next_next_time.begin
+    assert_equal Time.local(2006, 8, 15, 11, 59, 59), next_next_time.end
+  end
+  
+  def test_am_future_with_daylight_savings_time_boundary
+    @now = Time.local(2012,11,3,0,0,0)
+    day_portion = Chronic::RepeaterDayPortion.new(:am)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2012, 11, 4, 00), next_time.begin
+    assert_equal Time.local(2012, 11, 4, 11, 59, 59), next_time.end
+
+    next_next_time = day_portion.next(:future)
+
+    assert_equal Time.local(2012, 11, 5, 00), next_next_time.begin
+    assert_equal Time.local(2012, 11, 5, 11, 59, 59), next_next_time.end
+  end
+
+  def test_pm_future
+    day_portion = Chronic::RepeaterDayPortion.new(:pm)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 17, 12), next_time.begin
+    assert_equal Time.local(2006, 8, 17, 23, 59, 59), next_time.end
+
+    next_next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 18, 12), next_next_time.begin
+    assert_equal Time.local(2006, 8, 18, 23, 59, 59), next_next_time.end
+  end
+
+  def test_pm_past
+    day_portion = Chronic::RepeaterDayPortion.new(:pm)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 15, 12), next_time.begin
+    assert_equal Time.local(2006, 8, 15, 23, 59, 59), next_time.end
+
+    next_next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 14, 12), next_next_time.begin
+    assert_equal Time.local(2006, 8, 14, 23, 59, 59), next_next_time.end
+  end
+  
+  def test_pm_future_with_daylight_savings_time_boundary
+    @now = Time.local(2012,11,3,0,0,0)
+    day_portion = Chronic::RepeaterDayPortion.new(:pm)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2012, 11, 3, 12), next_time.begin
+    assert_equal Time.local(2012, 11, 3, 23, 59, 59), next_time.end
+
+    next_next_time = day_portion.next(:future)
+
+    assert_equal Time.local(2012, 11, 4, 12), next_next_time.begin
+    assert_equal Time.local(2012, 11, 4, 23, 59, 59), next_next_time.end
+  end
+
+  def test_morning_future
+    day_portion = Chronic::RepeaterDayPortion.new(:morning)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 17, 6), next_time.begin
+    assert_equal Time.local(2006, 8, 17, 12), next_time.end
+
+    next_next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 18, 6), next_next_time.begin
+    assert_equal Time.local(2006, 8, 18, 12), next_next_time.end
+  end
+
+  def test_morning_past
+    day_portion = Chronic::RepeaterDayPortion.new(:morning)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 16, 6), next_time.begin
+    assert_equal Time.local(2006, 8, 16, 12), next_time.end
+
+    next_next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 15, 6), next_next_time.begin
+    assert_equal Time.local(2006, 8, 15, 12), next_next_time.end
+  end
+  
+  def test_morning_future_with_daylight_savings_time_boundary
+    @now = Time.local(2012,11,3,0,0,0)
+    day_portion = Chronic::RepeaterDayPortion.new(:morning)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2012, 11, 3, 6), next_time.begin
+    assert_equal Time.local(2012, 11, 3, 12), next_time.end
+
+    next_next_time = day_portion.next(:future)
+
+    assert_equal Time.local(2012, 11, 4, 6), next_next_time.begin
+    assert_equal Time.local(2012, 11, 4, 12), next_next_time.end
+  end
+
+  def test_afternoon_future
+    day_portion = Chronic::RepeaterDayPortion.new(:afternoon)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 17, 13), next_time.begin
+    assert_equal Time.local(2006, 8, 17, 17), next_time.end
+
+    next_next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 18, 13), next_next_time.begin
+    assert_equal Time.local(2006, 8, 18, 17), next_next_time.end
+  end
+
+  def test_afternoon_past
+    day_portion = Chronic::RepeaterDayPortion.new(:afternoon)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 15, 13), next_time.begin
+    assert_equal Time.local(2006, 8, 15, 17), next_time.end
+
+    next_next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 14, 13), next_next_time.begin
+    assert_equal Time.local(2006, 8, 14, 17), next_next_time.end
+  end
+  
+  def test_afternoon_future_with_daylight_savings_time_boundary
+    @now = Time.local(2012,11,3,0,0,0)
+    day_portion = Chronic::RepeaterDayPortion.new(:afternoon)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2012, 11, 3, 13), next_time.begin
+    assert_equal Time.local(2012, 11, 3, 17), next_time.end
+
+    next_next_time = day_portion.next(:future)
+
+    assert_equal Time.local(2012, 11, 4, 13), next_next_time.begin
+    assert_equal Time.local(2012, 11, 4, 17), next_next_time.end
+  end
+
+  def test_evening_future
+    day_portion = Chronic::RepeaterDayPortion.new(:evening)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 16, 17), next_time.begin
+    assert_equal Time.local(2006, 8, 16, 20), next_time.end
+
+    next_next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 17, 17), next_next_time.begin
+    assert_equal Time.local(2006, 8, 17, 20), next_next_time.end
+  end
+
+  def test_evening_past
+    day_portion = Chronic::RepeaterDayPortion.new(:evening)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 15, 17), next_time.begin
+    assert_equal Time.local(2006, 8, 15, 20), next_time.end
+
+    next_next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 14, 17), next_next_time.begin
+    assert_equal Time.local(2006, 8, 14, 20), next_next_time.end
+  end
+  
+  def test_evening_future_with_daylight_savings_time_boundary
+    @now = Time.local(2012,11,3,0,0,0)
+    day_portion = Chronic::RepeaterDayPortion.new(:evening)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2012, 11, 3, 17), next_time.begin
+    assert_equal Time.local(2012, 11, 3, 20), next_time.end
+
+    next_next_time = day_portion.next(:future)
+
+    assert_equal Time.local(2012, 11, 4, 17), next_next_time.begin
+    assert_equal Time.local(2012, 11, 4, 20), next_next_time.end
+  end
+
+  def test_night_future
+    day_portion = Chronic::RepeaterDayPortion.new(:night)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 16, 20), next_time.begin
+    assert_equal Time.local(2006, 8, 17, 0), next_time.end
+
+    next_next_time = day_portion.next(:future)
+    assert_equal Time.local(2006, 8, 17, 20), next_next_time.begin
+    assert_equal Time.local(2006, 8, 18, 0), next_next_time.end
+  end
+
+  def test_night_past
+    day_portion = Chronic::RepeaterDayPortion.new(:night)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 15, 20), next_time.begin
+    assert_equal Time.local(2006, 8, 16, 0), next_time.end
+
+    next_next_time = day_portion.next(:past)
+    assert_equal Time.local(2006, 8, 14, 20), next_next_time.begin
+    assert_equal Time.local(2006, 8, 15, 0), next_next_time.end
+  end
+  
+  def test_night_future_with_daylight_savings_time_boundary
+    @now = Time.local(2012,11,3,0,0,0)
+    day_portion = Chronic::RepeaterDayPortion.new(:night)
+    day_portion.start = @now
+    
+    next_time = day_portion.next(:future)
+    assert_equal Time.local(2012, 11, 3, 20), next_time.begin
+    assert_equal Time.local(2012, 11, 4, 0), next_time.end
+
+    next_next_time = day_portion.next(:future)
+
+    assert_equal Time.local(2012, 11, 4, 20), next_next_time.begin
+    assert_equal Time.local(2012, 11, 5, 0), next_next_time.end
+  end
+end

data/test/{test_RepeaterFortnight.rb → test_repeater_fortnight.rb}

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

data/test/{test_RepeaterHour.rb → test_repeater_hour.rb}

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

data/test/{test_RepeaterMinute.rb → test_repeater_minute.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRepeaterMinute < Test::Unit::TestCase
+class TestRepeaterMinute < TestCase
 
   def setup
     @now = Time.local(2008, 6, 25, 7, 15, 30, 0)

data/test/{test_RepeaterMonth.rb → test_repeater_month.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRepeaterMonth < Test::Unit::TestCase
+class TestRepeaterMonth < TestCase
 
   def setup
     # Wed Aug 16 14:00:00 2006

data/test/{test_RepeaterMonthName.rb → test_repeater_month_name.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRepeaterMonthName < Test::Unit::TestCase
+class TestRepeaterMonthName < TestCase
 
   def setup
     # Wed Aug 16 14:00:00 2006