chronic 0.2.3 → 0.3.0

data/test/test_RepeaterMonthName.rb

@@ -1,57 +1,56 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 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

data/test/test_RepeaterTime.rb

@@ -1,43 +1,42 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class TestRepeaterTime < 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
     t = Chronic::RepeaterTime.new('4:00')
     t.start = @now
-    
+
     assert_equal Time.local(2006, 8, 16, 16), t.next(:future).begin
     assert_equal Time.local(2006, 8, 17, 4), t.next(:future).begin
-    
+
     t = Chronic::RepeaterTime.new('13:00')
     t.start = @now
-    
+
     assert_equal Time.local(2006, 8, 17, 13), t.next(:future).begin
     assert_equal Time.local(2006, 8, 18, 13), t.next(:future).begin
-    
+
     t = Chronic::RepeaterTime.new('0400')
     t.start = @now
-    
+
     assert_equal Time.local(2006, 8, 17, 4), t.next(:future).begin
     assert_equal Time.local(2006, 8, 18, 4), t.next(:future).begin
   end
-  
+
   def test_next_past
     t = Chronic::RepeaterTime.new('4:00')
     t.start = @now
-    
+
     assert_equal Time.local(2006, 8, 16, 4), t.next(:past).begin
     assert_equal Time.local(2006, 8, 15, 16), t.next(:past).begin
-    
+
     t = Chronic::RepeaterTime.new('13:00')
     t.start = @now
-    
+
     assert_equal Time.local(2006, 8, 16, 13), t.next(:past).begin
     assert_equal Time.local(2006, 8, 15, 13), t.next(:past).begin
   end
@@ -45,28 +44,27 @@ class TestRepeaterTime < Test::Unit::TestCase
   def test_type
     t1 = Chronic::RepeaterTime.new('4')
     assert_equal 14_400, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('14')
     assert_equal 50_400, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('4:00')
     assert_equal 14_400, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('4:30')
     assert_equal 16_200, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('1400')
     assert_equal 50_400, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('0400')
     assert_equal 14_400, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('04')
     assert_equal 14_400, t1.type.time
-    
+
     t1 = Chronic::RepeaterTime.new('400')
     assert_equal 14_400, t1.type.time
   end
 
-  
-end
+end

data/test/test_RepeaterWeek.rb

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class TestRepeaterWeek < Test::Unit::TestCase
-  
+
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
@@ -10,54 +9,54 @@ class TestRepeaterWeek < Test::Unit::TestCase
   def test_next_future
     weeks = Chronic::RepeaterWeek.new(:week)
     weeks.start = @now
-    
+
     next_week = weeks.next(:future)
     assert_equal Time.local(2006, 8, 20), next_week.begin
     assert_equal Time.local(2006, 8, 27), next_week.end
-    
+
     next_next_week = weeks.next(:future)
     assert_equal Time.local(2006, 8, 27), next_next_week.begin
     assert_equal Time.local(2006, 9, 3), next_next_week.end
   end
-  
+
   def test_next_past
     weeks = Chronic::RepeaterWeek.new(:week)
     weeks.start = @now
-    
+
     last_week = weeks.next(:past)
     assert_equal Time.local(2006, 8, 6), last_week.begin
     assert_equal Time.local(2006, 8, 13), last_week.end
-    
+
     last_last_week = weeks.next(:past)
     assert_equal Time.local(2006, 7, 30), last_last_week.begin
     assert_equal Time.local(2006, 8, 6), last_last_week.end
   end
-  
+
   def test_this_future
     weeks = Chronic::RepeaterWeek.new(:week)
     weeks.start = @now
-    
+
     this_week = weeks.this(:future)
     assert_equal Time.local(2006, 8, 16, 15), this_week.begin
     assert_equal Time.local(2006, 8, 20), this_week.end
   end
-  
+
   def test_this_past
     weeks = Chronic::RepeaterWeek.new(:week)
     weeks.start = @now
-    
+
     this_week = weeks.this(:past)
     assert_equal Time.local(2006, 8, 13, 0), this_week.begin
     assert_equal Time.local(2006, 8, 16, 14), this_week.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_RepeaterWeekday.rb

@@ -0,0 +1,55 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+class TestRepeaterWeekday < Test::Unit::TestCase
+
+  def setup
+    @now = Time.local(2007, 6, 11, 14, 0, 0, 0) # Mon
+  end
+
+  def test_next_future
+    weekdays = Chronic::RepeaterWeekday.new(:weekday)
+    weekdays.start = @now
+
+    next1_weekday = weekdays.next(:future) # Tues
+    assert_equal Time.local(2007, 6, 12), next1_weekday.begin
+    assert_equal Time.local(2007, 6, 13), next1_weekday.end
+
+    next2_weekday = weekdays.next(:future) # Wed
+    assert_equal Time.local(2007, 6, 13), next2_weekday.begin
+    assert_equal Time.local(2007, 6, 14), next2_weekday.end
+
+    next3_weekday = weekdays.next(:future) # Thurs
+    assert_equal Time.local(2007, 6, 14), next3_weekday.begin
+    assert_equal Time.local(2007, 6, 15), next3_weekday.end
+
+    next4_weekday = weekdays.next(:future) # Fri
+    assert_equal Time.local(2007, 6, 15), next4_weekday.begin
+    assert_equal Time.local(2007, 6, 16), next4_weekday.end
+
+    next5_weekday = weekdays.next(:future) # Mon
+    assert_equal Time.local(2007, 6, 18), next5_weekday.begin
+    assert_equal Time.local(2007, 6, 19), next5_weekday.end
+  end
+
+  def test_next_past
+    weekdays = Chronic::RepeaterWeekday.new(:weekday)
+    weekdays.start = @now
+
+    last1_weekday = weekdays.next(:past) # Fri
+    assert_equal Time.local(2007, 6, 8), last1_weekday.begin
+    assert_equal Time.local(2007, 6, 9), last1_weekday.end
+
+    last2_weekday = weekdays.next(:past) # Thurs
+    assert_equal Time.local(2007, 6, 7), last2_weekday.begin
+    assert_equal Time.local(2007, 6, 8), last2_weekday.end
+  end
+
+  def test_offset
+    span = Chronic::Span.new(@now, @now + 1)
+
+    offset_span = Chronic::RepeaterWeekday.new(:weekday).offset(span, 5, :future)
+
+    assert_equal Time.local(2007, 6, 18, 14), offset_span.begin
+    assert_equal Time.local(2007, 6, 18, 14, 0, 1), offset_span.end
+  end
+end

data/test/test_RepeaterWeekend.rb

@@ -1,75 +1,74 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class TestRepeaterWeekend < 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
     weekend = Chronic::RepeaterWeekend.new(:weekend)
     weekend.start = @now
-    
+
     next_weekend = weekend.next(:future)
     assert_equal Time.local(2006, 8, 19), next_weekend.begin
     assert_equal Time.local(2006, 8, 21), next_weekend.end
   end
-  
+
   def test_next_past
     weekend = Chronic::RepeaterWeekend.new(:weekend)
     weekend.start = @now
-    
+
     next_weekend = weekend.next(:past)
     assert_equal Time.local(2006, 8, 12), next_weekend.begin
     assert_equal Time.local(2006, 8, 14), next_weekend.end
   end
-  
+
   def test_this_future
     weekend = Chronic::RepeaterWeekend.new(:weekend)
     weekend.start = @now
-    
+
     next_weekend = weekend.this(:future)
     assert_equal Time.local(2006, 8, 19), next_weekend.begin
     assert_equal Time.local(2006, 8, 21), next_weekend.end
   end
-  
+
   def test_this_past
     weekend = Chronic::RepeaterWeekend.new(:weekend)
     weekend.start = @now
-    
+
     next_weekend = weekend.this(:past)
     assert_equal Time.local(2006, 8, 12), next_weekend.begin
     assert_equal Time.local(2006, 8, 14), next_weekend.end
   end
-  
+
   def test_this_none
     weekend = Chronic::RepeaterWeekend.new(:weekend)
     weekend.start = @now
-    
+
     next_weekend = weekend.this(:future)
     assert_equal Time.local(2006, 8, 19), next_weekend.begin
     assert_equal Time.local(2006, 8, 21), next_weekend.end
   end
-  
+
   def test_offset
     span = Chronic::Span.new(@now, @now + 1)
-    
+
     offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 3, :future)
-    
+
     assert_equal Time.local(2006, 9, 2), offset_span.begin
     assert_equal Time.local(2006, 9, 2, 0, 0, 1), offset_span.end
-    
+
     offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 1, :past)
-    
+
     assert_equal Time.local(2006, 8, 12), offset_span.begin
     assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
-    
+
     offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 0, :future)
-    
+
     assert_equal Time.local(2006, 8, 12), offset_span.begin
     assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
   end
-  
-end
+
+end

data/test/test_RepeaterYear.rb

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class TestRepeaterYear < Test::Unit::TestCase
-  
+
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
@@ -10,54 +9,54 @@ class TestRepeaterYear < Test::Unit::TestCase
   def test_next_future
     years = Chronic::RepeaterYear.new(:year)
     years.start = @now
-    
+
     next_year = years.next(:future)
     assert_equal Time.local(2007, 1, 1), next_year.begin
     assert_equal Time.local(2008, 1, 1), next_year.end
-    
+
     next_next_year = years.next(:future)
     assert_equal Time.local(2008, 1, 1), next_next_year.begin
     assert_equal Time.local(2009, 1, 1), next_next_year.end
   end
-  
+
   def test_next_past
     years = Chronic::RepeaterYear.new(:year)
     years.start = @now
-    
+
     last_year = years.next(:past)
     assert_equal Time.local(2005, 1, 1), last_year.begin
     assert_equal Time.local(2006, 1, 1), last_year.end
-    
+
     last_last_year = years.next(:past)
     assert_equal Time.local(2004, 1, 1), last_last_year.begin
     assert_equal Time.local(2005, 1, 1), last_last_year.end
   end
-  
+
   def test_this
     years = Chronic::RepeaterYear.new(:year)
     years.start = @now
-    
+
     this_year = years.this(:future)
     assert_equal Time.local(2006, 8, 17), this_year.begin
     assert_equal Time.local(2007, 1, 1), this_year.end
-    
+
     this_year = years.this(:past)
     assert_equal Time.local(2006, 1, 1), this_year.begin
     assert_equal Time.local(2006, 8, 16), this_year.end
   end
-  
+
   def test_offset
     span = Chronic::Span.new(@now, @now + 1)
-    
+
     offset_span = Chronic::RepeaterYear.new(:year).offset(span, 3, :future)
-    
+
     assert_equal Time.local(2009, 8, 16, 14), offset_span.begin
     assert_equal Time.local(2009, 8, 16, 14, 0, 1), offset_span.end
-    
+
     offset_span = Chronic::RepeaterYear.new(:year).offset(span, 10, :past)
-    
+
     assert_equal Time.local(1996, 8, 16, 14), offset_span.begin
     assert_equal Time.local(1996, 8, 16, 14, 0, 1), offset_span.end
   end
-  
-end
+
+end