chronic 0.5.0 → 0.6.0

data/lib/chronic/season.rb

@@ -17,9 +17,9 @@ module Chronic
     # @param [Integer] pointer The direction (-1 for past, 1 for future)
     # @return [Symbol] The new season name
     def self.find_next_season(season, pointer)
-      lookup = {:spring => 0, :summer => 1, :autumn => 2, :winter => 3}
-      next_season_num = (lookup[season] + 1 * pointer) % 4
-      lookup.invert[next_season_num]
+      lookup = [:spring, :summer, :autumn, :winter]
+      next_season_num = (lookup.index(season) + 1 * pointer) % 4
+      lookup[next_season_num]
     end
 
     # @param [Symbol] season The season name

data/lib/chronic/tag.rb

@@ -35,6 +35,8 @@ module Chronic
         end
         nil
       end
+
     end
+
   end
 end

data/test/test_Chronic.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestChronic < Test::Unit::TestCase
 
@@ -74,17 +74,17 @@ class TestChronic < Test::Unit::TestCase
     defs = Chronic.definitions(:endian_precedence => [:little, :middle])
     assert_equal endians.reverse, defs[:endian]
 
-    assert_raises(Chronic::InvalidArgumentException) do
+    assert_raises(ArgumentError) do
       Chronic.definitions(:endian_precedence => :invalid)
     end
   end
 
   def test_passing_options
-    assert_raises(Chronic::InvalidArgumentException) do
+    assert_raises(ArgumentError) do
       Chronic.parse('now', :invalid => :option)
     end
 
-    assert_raises(Chronic::InvalidArgumentException) do
+    assert_raises(ArgumentError) do
       Chronic.parse('now', :context => :invalid_context)
     end
   end
@@ -101,4 +101,48 @@ class TestChronic < Test::Unit::TestCase
     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
 

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

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

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
 

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
 

data/test/test_parsing.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
+require 'helper'
 
 class TestParsing < Test::Unit::TestCase
   # Wed Aug 16 14:00:00 UTC 2006
@@ -8,9 +8,6 @@ class TestParsing < Test::Unit::TestCase
     @time_2006_08_16_14_00_00 = TIME_2006_08_16_14_00_00
   end
 
-  def test_parse_m_d
-  end
-
   def test_handle_rmn_sd
     time = parse_now("aug 3")
     assert_equal Time.local(2006, 8, 3, 12), time
@@ -109,6 +106,11 @@ class TestParsing < Test::Unit::TestCase
     assert_equal 1175558400, time.to_i
   end
 
+  def test_handle_sy_sm_sd_t_tz
+    time = parse_now("2011-07-03 22:11:35 +0100")
+    assert_equal 1309727495, time.to_i
+  end
+
   def test_handle_rmn_sd_sy
     time = parse_now("November 18, 2010")
     assert_equal Time.local(2010, 11, 18, 12), time
@@ -207,6 +209,10 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("5/27/1979 4am")
     assert_equal Time.local(1979, 5, 27, 4), time
+
+    # month day overflows
+    time = parse_now("30/2/2000")
+    assert_nil time
   end
 
   def test_handle_sd_sm_sy
@@ -777,11 +783,11 @@ class TestParsing < Test::Unit::TestCase
   end
 
   def test_argument_validation
-    assert_raise(Chronic::InvalidArgumentException) do
+    assert_raise(ArgumentError) do
       time = Chronic.parse("may 27", :foo => :bar)
     end
 
-    assert_raise(Chronic::InvalidArgumentException) do
+    assert_raise(ArgumentError) do
       time = Chronic.parse("may 27", :context => :bar)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000 +01:00
+date: 2011-07-19 00:00:00.000000000 +01:00
 default_executable: 
 dependencies: []
 description: Chronic is a natural language date/time parser written in pure Ruby.
@@ -29,13 +29,13 @@ files:
 - .yardopts
 - HISTORY.md
 - LICENSE
-- Manifest.txt
 - README.md
 - Rakefile
 - chronic.gemspec
 - lib/chronic.rb
 - lib/chronic/chronic.rb
 - lib/chronic/grabber.rb
+- lib/chronic/handler.rb
 - lib/chronic/handlers.rb
 - lib/chronic/mini_date.rb
 - lib/chronic/numerizer.rb
@@ -84,7 +84,6 @@ files:
 - test/test_RepeaterWeekend.rb
 - test/test_RepeaterYear.rb
 - test/test_Span.rb
-- test/test_Time.rb
 - test/test_Token.rb
 - test/test_parsing.rb
 has_rdoc: true
@@ -133,6 +132,5 @@ test_files:
 - test/test_RepeaterWeekend.rb
 - test/test_RepeaterYear.rb
 - test/test_Span.rb
-- test/test_Time.rb
 - test/test_Token.rb
 - test/test_parsing.rb

data/Manifest.txt

@@ -1,63 +0,0 @@
-.gemtest
-.gitignore
-.yardopts
-HISTORY.md
-LICENSE
-Manifest.txt
-README.md
-Rakefile
-chronic.gemspec
-lib/chronic.rb
-lib/chronic/chronic.rb
-lib/chronic/grabber.rb
-lib/chronic/handlers.rb
-lib/chronic/mini_date.rb
-lib/chronic/numerizer.rb
-lib/chronic/ordinal.rb
-lib/chronic/pointer.rb
-lib/chronic/repeater.rb
-lib/chronic/repeaters/repeater_day.rb
-lib/chronic/repeaters/repeater_day_name.rb
-lib/chronic/repeaters/repeater_day_portion.rb
-lib/chronic/repeaters/repeater_fortnight.rb
-lib/chronic/repeaters/repeater_hour.rb
-lib/chronic/repeaters/repeater_minute.rb
-lib/chronic/repeaters/repeater_month.rb
-lib/chronic/repeaters/repeater_month_name.rb
-lib/chronic/repeaters/repeater_season.rb
-lib/chronic/repeaters/repeater_season_name.rb
-lib/chronic/repeaters/repeater_second.rb
-lib/chronic/repeaters/repeater_time.rb
-lib/chronic/repeaters/repeater_week.rb
-lib/chronic/repeaters/repeater_weekday.rb
-lib/chronic/repeaters/repeater_weekend.rb
-lib/chronic/repeaters/repeater_year.rb
-lib/chronic/scalar.rb
-lib/chronic/season.rb
-lib/chronic/separator.rb
-lib/chronic/span.rb
-lib/chronic/tag.rb
-lib/chronic/time_zone.rb
-lib/chronic/token.rb
-test/helper.rb
-test/test_Chronic.rb
-test/test_DaylightSavings.rb
-test/test_Handler.rb
-test/test_MiniDate.rb
-test/test_Numerizer.rb
-test/test_RepeaterDayName.rb
-test/test_RepeaterFortnight.rb
-test/test_RepeaterHour.rb
-test/test_RepeaterMinute.rb
-test/test_RepeaterMonth.rb
-test/test_RepeaterMonthName.rb
-test/test_RepeaterSeason.rb
-test/test_RepeaterTime.rb
-test/test_RepeaterWeek.rb
-test/test_RepeaterWeekday.rb
-test/test_RepeaterWeekend.rb
-test/test_RepeaterYear.rb
-test/test_Span.rb
-test/test_Time.rb
-test/test_Token.rb
-test/test_parsing.rb

data/test/test_Time.rb

@@ -1,49 +0,0 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
-
-class TestTime < Test::Unit::TestCase
-
-  def setup
-  end
-
-  def test_normal
-    assert_equal Time.local(2006, 1, 2, 0, 0, 0), Time.construct(2006, 1, 2, 0, 0, 0)
-    assert_equal Time.local(2006, 1, 2, 3, 0, 0), Time.construct(2006, 1, 2, 3, 0, 0)
-    assert_equal Time.local(2006, 1, 2, 3, 4, 0), Time.construct(2006, 1, 2, 3, 4, 0)
-    assert_equal Time.local(2006, 1, 2, 3, 4, 5), Time.construct(2006, 1, 2, 3, 4, 5)
-  end
-
-  def test_second_overflow
-    assert_equal Time.local(2006, 1, 1, 0, 1, 30), Time.construct(2006, 1, 1, 0, 0, 90)
-    assert_equal Time.local(2006, 1, 1, 0, 5, 0), Time.construct(2006, 1, 1, 0, 0, 300)
-  end
-
-  def test_minute_overflow
-    assert_equal Time.local(2006, 1, 1, 1, 30), Time.construct(2006, 1, 1, 0, 90)
-    assert_equal Time.local(2006, 1, 1, 5), Time.construct(2006, 1, 1, 0, 300)
-  end
-
-  def test_hour_overflow
-    assert_equal Time.local(2006, 1, 2, 12), Time.construct(2006, 1, 1, 36)
-    assert_equal Time.local(2006, 1, 7), Time.construct(2006, 1, 1, 144)
-  end
-
-  def test_day_overflow
-    assert_equal Time.local(2006, 2, 1), Time.construct(2006, 1, 32)
-    assert_equal Time.local(2006, 3, 5), Time.construct(2006, 2, 33)
-    assert_equal Time.local(2004, 3, 4), Time.construct(2004, 2, 33)
-    assert_equal Time.local(2000, 3, 4), Time.construct(2000, 2, 33)
-
-    assert_nothing_raised do
-      Time.construct(2006, 1, 56)
-    end
-
-    assert_raise(RuntimeError) do
-      Time.construct(2006, 1, 57)
-    end
-  end
-
-  def test_month_overflow
-    assert_equal Time.local(2006, 1), Time.construct(2005, 13)
-    assert_equal Time.local(2005, 12), Time.construct(2000, 72)
-  end
-end