chronic 0.2.2 → 0.10.2

data/test/{test_RepeaterDayName.rb → test_repeater_day_name.rb}

@@ -1,18 +1,17 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
+
+class TestRepeaterDayName < TestCase
 
-class TestRepeaterDayName < Test::Unit::TestCase
-  
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
-  
+
   def test_match
     token = Chronic::Token.new('saturday')
     repeater = Chronic::Repeater.scan_for_day_names(token)
     assert_equal Chronic::RepeaterDayName, repeater.class
     assert_equal :saturday, repeater.type
-    
+
     token = Chronic::Token.new('sunday')
     repeater = Chronic::Repeater.scan_for_day_names(token)
     assert_equal Chronic::RepeaterDayName, repeater.class
@@ -22,31 +21,31 @@ class TestRepeaterDayName < Test::Unit::TestCase
   def test_next_future
     mondays = Chronic::RepeaterDayName.new(:monday)
     mondays.start = @now
-    
+
     span = mondays.next(:future)
-    
+
     assert_equal Time.local(2006, 8, 21), span.begin
-    assert_equal Time.local(2006, 8, 22), span.end 
+    assert_equal Time.local(2006, 8, 22), span.end
 
     span = mondays.next(:future)
-    
+
     assert_equal Time.local(2006, 8, 28), span.begin
     assert_equal Time.local(2006, 8, 29), span.end
   end
-  
+
   def test_next_past
     mondays = Chronic::RepeaterDayName.new(:monday)
     mondays.start = @now
-    
+
     span = mondays.next(:past)
-    
+
     assert_equal Time.local(2006, 8, 14), span.begin
-    assert_equal Time.local(2006, 8, 15), span.end 
+    assert_equal Time.local(2006, 8, 15), span.end
 
     span = mondays.next(:past)
-    
+
     assert_equal Time.local(2006, 8, 7), span.begin
     assert_equal Time.local(2006, 8, 8), span.end
   end
-  
-end
+
+end

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,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
+
+class TestRepeaterFortnight < TestCase
 
-class TestRepeaterFortnight < Test::Unit::TestCase
-  
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
@@ -10,54 +9,54 @@ class TestRepeaterFortnight < Test::Unit::TestCase
   def test_next_future
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     next_fortnight = fortnights.next(:future)
     assert_equal Time.local(2006, 8, 20), next_fortnight.begin
     assert_equal Time.local(2006, 9, 3), next_fortnight.end
-    
+
     next_next_fortnight = fortnights.next(:future)
     assert_equal Time.local(2006, 9, 3), next_next_fortnight.begin
     assert_equal Time.local(2006, 9, 17), next_next_fortnight.end
   end
-  
+
   def test_next_past
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     last_fortnight = fortnights.next(:past)
     assert_equal Time.local(2006, 7, 30), last_fortnight.begin
     assert_equal Time.local(2006, 8, 13), last_fortnight.end
-    
+
     last_last_fortnight = fortnights.next(:past)
     assert_equal Time.local(2006, 7, 16), last_last_fortnight.begin
     assert_equal Time.local(2006, 7, 30), last_last_fortnight.end
   end
-  
+
   def test_this_future
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     this_fortnight = fortnights.this(:future)
     assert_equal Time.local(2006, 8, 16, 15), this_fortnight.begin
     assert_equal Time.local(2006, 8, 27), this_fortnight.end
   end
-  
+
   def test_this_past
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     this_fortnight = fortnights.this(:past)
     assert_equal Time.local(2006, 8, 13, 0), this_fortnight.begin
     assert_equal Time.local(2006, 8, 16, 14), this_fortnight.end
   end
-  
+
   def test_offset
     span = Chronic::Span.new(@now, @now + 1)
-    
+
     offset_span = Chronic::RepeaterWeek.new(:week).offset(span, 3, :future)
-    
+
     assert_equal Time.local(2006, 9, 6, 14), offset_span.begin
     assert_equal Time.local(2006, 9, 6, 14, 0, 1), offset_span.end
   end
-  
-end
+
+end

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

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
+
+class TestRepeaterHour < TestCase
 
-class TestRepeaterHour < Test::Unit::TestCase
-  
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
@@ -10,56 +9,60 @@ class TestRepeaterHour < Test::Unit::TestCase
   def test_next_future
     hours = Chronic::RepeaterHour.new(:hour)
     hours.start = @now
-    
+
     next_hour = hours.next(:future)
     assert_equal Time.local(2006, 8, 16, 15), next_hour.begin
     assert_equal Time.local(2006, 8, 16, 16), next_hour.end
-    
+
     next_next_hour = hours.next(:future)
     assert_equal Time.local(2006, 8, 16, 16), next_next_hour.begin
     assert_equal Time.local(2006, 8, 16, 17), next_next_hour.end
   end
-  
+
   def test_next_past
     hours = Chronic::RepeaterHour.new(:hour)
     hours.start = @now
-    
+
     past_hour = hours.next(:past)
     assert_equal Time.local(2006, 8, 16, 13), past_hour.begin
     assert_equal Time.local(2006, 8, 16, 14), past_hour.end
-    
+
     past_past_hour = hours.next(:past)
     assert_equal Time.local(2006, 8, 16, 12), past_past_hour.begin
     assert_equal Time.local(2006, 8, 16, 13), past_past_hour.end
   end
-  
+
   def test_this
     @now = Time.local(2006, 8, 16, 14, 30)
-    
+
     hours = Chronic::RepeaterHour.new(:hour)
     hours.start = @now
-    
+
     this_hour = hours.this(:future)
     assert_equal Time.local(2006, 8, 16, 14, 31), this_hour.begin
     assert_equal Time.local(2006, 8, 16, 15), this_hour.end
-    
+
     this_hour = hours.this(:past)
     assert_equal Time.local(2006, 8, 16, 14), this_hour.begin
     assert_equal Time.local(2006, 8, 16, 14, 30), this_hour.end
+
+    this_hour = hours.this(:none)
+    assert_equal Time.local(2006, 8, 16, 14), this_hour.begin
+    assert_equal Time.local(2006, 8, 16, 15), this_hour.end
   end
-  
+
   def test_offset
     span = Chronic::Span.new(@now, @now + 1)
-    
+
     offset_span = Chronic::RepeaterHour.new(:hour).offset(span, 3, :future)
-    
+
     assert_equal Time.local(2006, 8, 16, 17), offset_span.begin
     assert_equal Time.local(2006, 8, 16, 17, 0, 1), offset_span.end
-    
+
     offset_span = Chronic::RepeaterHour.new(:hour).offset(span, 24, :past)
-    
+
     assert_equal Time.local(2006, 8, 15, 14), offset_span.begin
     assert_equal Time.local(2006, 8, 15, 14, 0, 1), offset_span.end
   end
-  
-end
+
+end

data/test/test_repeater_minute.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+class TestRepeaterMinute < TestCase
+
+  def setup
+    @now = Time.local(2008, 6, 25, 7, 15, 30, 0)
+  end
+
+  def test_next_future
+    minutes = Chronic::RepeaterMinute.new(:minute)
+    minutes.start = @now
+
+    next_minute = minutes.next(:future)
+    assert_equal Time.local(2008, 6, 25, 7, 16), next_minute.begin
+    assert_equal Time.local(2008, 6, 25, 7, 17), next_minute.end
+
+    next_next_minute = minutes.next(:future)
+    assert_equal Time.local(2008, 6, 25, 7, 17), next_next_minute.begin
+    assert_equal Time.local(2008, 6, 25, 7, 18), next_next_minute.end
+  end
+
+  def test_next_past
+    minutes = Chronic::RepeaterMinute.new(:minute)
+    minutes.start = @now
+
+    prev_minute = minutes.next(:past)
+    assert_equal Time.local(2008, 6, 25, 7, 14), prev_minute.begin
+    assert_equal Time.local(2008, 6, 25, 7, 15), prev_minute.end
+
+    prev_prev_minute = minutes.next(:past)
+    assert_equal Time.local(2008, 6, 25, 7, 13), prev_prev_minute.begin
+    assert_equal Time.local(2008, 6, 25, 7, 14), prev_prev_minute.end
+  end
+end

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

@@ -1,47 +1,50 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
+
+class TestRepeaterMonth < TestCase
 
-class TestRepeaterMonth < Test::Unit::TestCase
-  
   def setup
     # Wed Aug 16 14:00:00 2006
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
-  
+
   def test_offset_by
     # future
-    
+
     time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 1, :future)
     assert_equal Time.local(2006, 9, 16, 14), time
-    
+
     time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 5, :future)
     assert_equal Time.local(2007, 1, 16, 14), time
-    
+
     # past
-    
+
     time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 1, :past)
     assert_equal Time.local(2006, 7, 16, 14), time
-    
+
     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
     # future
-    
+
     span = Chronic::Span.new(@now, @now + 60)
     offset_span = Chronic::RepeaterMonth.new(:month).offset(span, 1, :future)
-    
+
     assert_equal Time.local(2006, 9, 16, 14), offset_span.begin
     assert_equal Time.local(2006, 9, 16, 14, 1), offset_span.end
-    
+
    # past
-   
+
    span = Chronic::Span.new(@now, @now + 60)
    offset_span = Chronic::RepeaterMonth.new(:month).offset(span, 1, :past)
-   
+
    assert_equal Time.local(2006, 7, 16, 14), offset_span.begin
    assert_equal Time.local(2006, 7, 16, 14, 1), offset_span.end
   end
-  
-end
+
+end

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

@@ -1,57 +1,56 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
+
+class TestRepeaterMonthName < TestCase
 
-class TestRepeaterMonthName < Test::Unit::TestCase
-  
   def setup
     # Wed Aug 16 14:00:00 2006
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
-  
+
   def test_next
     # future
-    
+
     mays = Chronic::RepeaterMonthName.new(:may)
     mays.start = @now
-    
+
     next_may = mays.next(:future)
     assert_equal Time.local(2007, 5), next_may.begin
     assert_equal Time.local(2007, 6), next_may.end
-    
+
     next_next_may = mays.next(:future)
     assert_equal Time.local(2008, 5), next_next_may.begin
     assert_equal Time.local(2008, 6), next_next_may.end
-    
+
     decembers = Chronic::RepeaterMonthName.new(:december)
     decembers.start = @now
-    
+
     next_december = decembers.next(:future)
     assert_equal Time.local(2006, 12), next_december.begin
     assert_equal Time.local(2007, 1), next_december.end
-    
+
     # past
-    
+
     mays = Chronic::RepeaterMonthName.new(:may)
     mays.start = @now
-    
+
     assert_equal Time.local(2006, 5), mays.next(:past).begin
     assert_equal Time.local(2005, 5), mays.next(:past).begin
   end
-  
+
   def test_this
     octobers = Chronic::RepeaterMonthName.new(:october)
     octobers.start = @now
-    
+
     this_october = octobers.this(:future)
     assert_equal Time.local(2006, 10, 1), this_october.begin
     assert_equal Time.local(2006, 11, 1), this_october.end
-    
+
     aprils = Chronic::RepeaterMonthName.new(:april)
     aprils.start = @now
-    
+
     this_april = aprils.this(:past)
     assert_equal Time.local(2006, 4, 1), this_april.begin
     assert_equal Time.local(2006, 5, 1), this_april.end
   end
-  
-end
+
+end