chronic 0.2.3 → 0.3.0

data/test/test_Handler.rb

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class TestHandler < Test::Unit::TestCase
-  
+
   def setup
     # Wed Aug 16 14:00:00 UTC 2006
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
@@ -10,101 +9,101 @@ class TestHandler < Test::Unit::TestCase
 
   def test_handler_class_1
     handler = Chronic::Handler.new([:repeater], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_2
     handler = Chronic::Handler.new([:repeater, :repeater?], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[2].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_3
     handler = Chronic::Handler.new([:repeater, 'time?'], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_4
     handler = Chronic::Handler.new([:repeater_month_name, :scalar_day, 'time?'], :handler)
-    
+
     tokens = [Chronic::Token.new('may')]
     tokens[0].tag(Chronic::RepeaterMonthName.new(:may))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('27')
     tokens[1].tag(Chronic::ScalarDay.new(27))
-    
+
     assert handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_5
     handler = Chronic::Handler.new([:repeater, 'time?'], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('5:00')
     tokens[1].tag(Chronic::RepeaterTime.new('5:00'))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('pm')
     tokens[2].tag(Chronic::RepeaterDayPortion.new(:pm))
-    
+
     assert handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_6
     handler = Chronic::Handler.new([:scalar, :repeater, :pointer], :handler)
-    
+
     tokens = [Chronic::Token.new('3'),
               Chronic::Token.new('years'),
               Chronic::Token.new('past')]
-              
+
     tokens[0].tag(Chronic::Scalar.new(3))
     tokens[1].tag(Chronic::RepeaterYear.new(:year))
     tokens[2].tag(Chronic::Pointer.new(:past))
-    
+
     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
+
+end

data/test/test_Numerizer.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'chronic'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class ParseNumbersTest < Test::Unit::TestCase
 
@@ -23,7 +22,7 @@ class ParseNumbersTest < Test::Unit::TestCase
                100 => 'a hundred',
                100 => 'one hundred',
                150 => 'one hundred and fifty',
-            #   150 => 'one fifty',
+               # 150 => 'one fifty',
                200 => 'two-hundred',
                500 => '5 hundred',
                999 => 'nine hundred and ninety nine',
@@ -40,9 +39,13 @@ class ParseNumbersTest < Test::Unit::TestCase
                1_250_007 => 'one million two hundred fifty thousand and seven',
                1_000_000_000 => 'one billion',
                1_000_000_001 => 'one billion and one' }
-               
+
     strings.keys.sort.each do |key|
       assert_equal key, Numerizer.numerize(strings[key]).to_i
     end
   end
-end
+
+  def test_edges
+    assert_equal "27 Oct 2006 7:30am", Numerizer.numerize("27 Oct 2006 7:30am")
+  end
+end

data/test/test_RepeaterDayName.rb

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

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

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[helper])
 
 class TestRepeaterHour < Test::Unit::TestCase
-  
+
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
@@ -10,56 +9,56 @@ 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
   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_RepeaterMinute.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+class TestRepeaterMinute < Test::Unit::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

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