chronic 0.4.4 → 0.5.0

data/HISTORY.md

@@ -1,9 +1,24 @@
-# 0.4.4
+# TBA
+
+* Replace commas with spaces instead of removing the char (Thomas Walpole)
+* Added tests for RepeaterSeason
+* Re-factored tests. Now rather than having a test_parsing method for testing
+  all handlers, break them down independent of handler method. For example
+  with handler `handle_sm_sd_sy` the subsequent test would be
+  `test_handle_sm_sd_sy`
+* Added support for parsing ordinal-dates/month-names/year, ie:
+  `2nd of May 1995`
+* Added support for parsing ordinal-dates and month names, ie:
+  `22nd of February at 6:30pm`
+* Fix `Time.construct` leap year checking. Instead use `Date.leap?(year)`
+
+# 0.4.4 / 2011-06-12
 
 * Fix RepeaterYear for fetching past year offsets when the current day is
   later than the last day of the same month in a past year (leap years) ie
   on 29th/feb (leap year) `last year` should (and now does) return 28th/feb
   instead of 1st/march
+* Opt in for gem testing http://test.rubygems.org/
 
 # 0.4.3 / 2011-06-08
 

data/Manifest.txt

@@ -1,3 +1,6 @@
+.gemtest
+.gitignore
+.yardopts
 HISTORY.md
 LICENSE
 Manifest.txt
@@ -30,6 +33,7 @@ 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
@@ -47,6 +51,7 @@ 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

data/README.md

@@ -98,10 +98,14 @@ Complex
 * 3rd month next year
 * 3rd thursday this september
 * 4th day last week
+* fourteenth of june 2010 at eleven o'clock in the evening
+* may seventh '97 at three in the morning
 
 Specific Dates
 
 * January 5
+* 22nd of june
+* 5th may 2017
 * February twenty first
 * dec 25
 * may 27th
@@ -125,6 +129,7 @@ Specific Dates
 Specific Times (many of the above with an added time)
 
 * January 5 at 7pm
+* 22nd of june at 8am
 * 1979-05-27 05:00:00
 * etc
 

data/lib/chronic.rb

@@ -28,7 +28,7 @@ require 'date'
 #
 # @author Tom Preston-Werner, Lee Jarvis
 module Chronic
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 
   class << self
 
@@ -77,6 +77,7 @@ require 'chronic/ordinal'
 require 'chronic/separator'
 require 'chronic/time_zone'
 require 'chronic/numerizer'
+require 'chronic/season'
 
 require 'chronic/repeater'
 require 'chronic/repeaters/repeater_year'
@@ -118,10 +119,9 @@ class Time
     day <= 56 || raise("day must be no more than 56 (makes month resolution easier)")
     if day > 28
       # no month ever has fewer than 28 days, so only do this if necessary
-      leap_year = (year % 4 == 0) && !(year % 100 == 0)
       leap_year_month_days = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
       common_year_month_days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-      days_this_month = leap_year ? leap_year_month_days[month - 1] : common_year_month_days[month - 1]
+      days_this_month = Date.leap?(year) ? leap_year_month_days[month - 1] : common_year_month_days[month - 1]
       if day > days_this_month
         month += day / days_this_month
         day = day % days_this_month

data/lib/chronic/chronic.rb

@@ -111,7 +111,8 @@ module Chronic
     # @return [String] A new string ready for Chronic to parse
     def pre_normalize(text)
       text = text.to_s.downcase
-      text.gsub!(/['"\.,]/, '')
+      text.gsub!(/['"\.]/, '')
+      text.gsub!(/,/,' ')
       text.gsub!(/\bsecond (of|day|month|hour|minute|second)\b/, '2nd \1')
       text = numericize_numbers(text)
       text.gsub!(/ \-(\d{4})\b/, ' tzminus\1')
@@ -180,6 +181,8 @@ module Chronic
           Handler.new([:repeater_month_name, :scalar_day, :separator_at?, 'time?'], :handle_rmn_sd),
           Handler.new([:repeater_time, :repeater_day_portion?, :separator_on?, :repeater_month_name, :scalar_day], :handle_rmn_sd_on),
           Handler.new([:repeater_month_name, :ordinal_day, :separator_at?, 'time?'], :handle_rmn_od),
+          Handler.new([:ordinal_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_od_rmn_sy),
+          Handler.new([:ordinal_day, :repeater_month_name, :separator_at?, 'time?'], :handle_od_rmn),
           Handler.new([:repeater_time, :repeater_day_portion?, :separator_on?, :repeater_month_name, :ordinal_day], :handle_rmn_od_on),
           Handler.new([:repeater_month_name, :scalar_year], :handle_rmn_sy),
           Handler.new([:scalar_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_sd_rmn_sy),
@@ -258,8 +261,7 @@ module Chronic
       definitions[:arrow].each do |handler|
         if handler.match(tokens, definitions)
           puts "-arrow" if Chronic.debug
-          tags = [SeparatorAt, SeparatorSlashOrDash, SeparatorComma]
-          good_tokens = tokens.reject { |o| tags.any? { |t| o.get_tag(t) } }
+          good_tokens = tokens.reject { |o| o.get_tag(SeparatorAt) || o.get_tag(SeparatorSlashOrDash) || o.get_tag(SeparatorComma) }
           return Handlers.send(handler.handler_method, good_tokens, options)
         end
       end

data/lib/chronic/handlers.rb

@@ -31,6 +31,11 @@ module Chronic
       handle_m_d(tokens[0].get_tag(RepeaterMonthName), tokens[1].get_tag(OrdinalDay).type, tokens[2..tokens.size], options)
     end
 
+    # Handle ordinal-day/repeater-month-name
+    def handle_od_rmn(tokens, options) #:nodoc:
+      handle_m_d(tokens[1].get_tag(RepeaterMonthName), tokens[0].get_tag(OrdinalDay).type, tokens[2..tokens.size], options)
+    end
+
     # Handle repeater-month-name/ordinal-day with separator-on
     def handle_rmn_od_on(tokens, options) #:nodoc:
       if tokens.size > 3
@@ -98,6 +103,22 @@ module Chronic
       end
     end
 
+    # Handle oridinal-day/repeater-month-name/scalar-year
+    def handle_od_rmn_sy(tokens, options) #:nodoc:
+      day = tokens[0].get_tag(OrdinalDay).type
+      month = tokens[1].get_tag(RepeaterMonthName).index
+      year = tokens[2].get_tag(ScalarYear).type
+
+      time_tokens = tokens.last(tokens.size - 3)
+
+      begin
+        day_start = Chronic.time_class.local(year, month, day)
+        day_or_time(day_start, time_tokens, options)
+      rescue ArgumentError
+        nil
+      end
+    end
+
     # Handle scalar-day/repeater-month-name/scalar-year
     def handle_sd_rmn_sy(tokens, options) #:nodoc:
       new_tokens = [tokens[1], tokens[0], tokens[2]]

data/lib/chronic/repeater.rb

@@ -119,7 +119,7 @@ module Chronic
 
     # returns the width (in seconds or months) of this repeatable.
     def width
-      raise("Repeatable#width must be overridden in subclasses")
+      raise("Repeater#width must be overridden in subclasses")
     end
 
     # returns the next occurance of this repeatable.

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -24,25 +24,24 @@ module Chronic
       super
 
       if !@current_month_begin
-        target_month = symbol_to_number(@type)
         case pointer
         when :future
-          if @now.month < target_month
-            @current_month_begin = Time.construct(@now.year, target_month)
-          elsif @now.month > target_month
-            @current_month_begin = Time.construct(@now.year + 1, target_month)
+          if @now.month < index
+            @current_month_begin = Time.construct(@now.year, index)
+          elsif @now.month > index
+            @current_month_begin = Time.construct(@now.year + 1, index)
           end
         when :none
-          if @now.month <= target_month
-            @current_month_begin = Time.construct(@now.year, target_month)
-          elsif @now.month > target_month
-            @current_month_begin = Time.construct(@now.year + 1, target_month)
+          if @now.month <= index
+            @current_month_begin = Time.construct(@now.year, index)
+          elsif @now.month > index
+            @current_month_begin = Time.construct(@now.year + 1, index)
           end
         when :past
-          if @now.month >= target_month
-            @current_month_begin = Time.construct(@now.year, target_month)
-          elsif @now.month < target_month
-            @current_month_begin = Time.construct(@now.year - 1, target_month)
+          if @now.month >= index
+            @current_month_begin = Time.construct(@now.year, index)
+          elsif @now.month < index
+            @current_month_begin = Time.construct(@now.year - 1, index)
           end
         end
         @current_month_begin || raise("Current month should be set by now")
@@ -85,17 +84,11 @@ module Chronic
     end
 
     def index
-      symbol_to_number(@type)
+      @index ||= MONTHS[@type]
     end
 
     def to_s
       super << '-monthname-' << @type.to_s
     end
-
-    private
-
-    def symbol_to_number(sym)
-      MONTHS[sym] || raise("Invalid symbol specified")
-    end
   end
 end

data/lib/chronic/repeaters/repeater_season.rb

@@ -1,40 +1,4 @@
 module Chronic
-  class Season
-    # @return [MiniDate]
-    attr_reader :start
-
-    # @return [MiniDate]
-    attr_reader :end
-
-    # @param [MiniDate] start_date
-    # @param [MiniDate] end_date
-    def initialize(start_date, end_date)
-      @start = start_date
-      @end = end_date
-    end
-
-    # @param [Symbol]  season  The season name
-    # @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]
-    end
-
-    # @param [Symbol] season The season name
-    # @return [Symbol] The new season name
-    def self.season_after(season)
-      find_next_season(season, +1)
-    end
-
-    # @param [Symbol] season The season name
-    # @return [Symbol] The new season name
-    def self.season_before(season)
-      find_next_season(season, -1)
-    end
-  end
-
   class RepeaterSeason < Repeater #:nodoc:
     SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
     SEASONS = {

data/lib/chronic/repeaters/repeater_season_name.rb

@@ -9,8 +9,6 @@ module Chronic
     end
 
     def this(pointer = :future)
-      # super
-
       direction = pointer == :future ? 1 : -1
 
       today = Time.construct(@now.year, @now.month, @now.day)

data/lib/chronic/season.rb

@@ -0,0 +1,37 @@
+module Chronic
+  class Season
+    # @return [MiniDate]
+    attr_reader :start
+
+    # @return [MiniDate]
+    attr_reader :end
+
+    # @param [MiniDate] start_date
+    # @param [MiniDate] end_date
+    def initialize(start_date, end_date)
+      @start = start_date
+      @end = end_date
+    end
+
+    # @param [Symbol]  season  The season name
+    # @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]
+    end
+
+    # @param [Symbol] season The season name
+    # @return [Symbol] The new season name
+    def self.season_after(season)
+      find_next_season(season, +1)
+    end
+
+    # @param [Symbol] season The season name
+    # @return [Symbol] The new season name
+    def self.season_before(season)
+      find_next_season(season, -1)
+    end
+  end
+end

data/test/test_RepeaterSeason.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+class TestRepeaterSeason < Test::Unit::TestCase
+
+  def setup
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_next_future
+    seasons = Chronic::RepeaterSeason.new(:season)
+    seasons.start = @now
+
+    next_season = seasons.next(:future)
+    assert_equal Time.local(2006, 9, 23), next_season.begin
+    assert_equal Time.local(2006, 12, 21), next_season.end
+  end
+
+  def test_next_past
+    seasons = Chronic::RepeaterSeason.new(:season)
+    seasons.start = @now
+
+    last_season = seasons.next(:past)
+    assert_equal Time.local(2006, 3, 20), last_season.begin
+    assert_equal Time.local(2006, 6, 20), last_season.end
+  end
+
+  def test_this
+    seasons = Chronic::RepeaterSeason.new(:season)
+    seasons.start = @now
+
+    this_season = seasons.this(:future)
+    assert_equal Time.local(2006, 8, 17), this_season.begin
+    assert_equal Time.local(2006, 9, 22), this_season.end
+
+    this_season = seasons.this(:past)
+    assert_equal Time.local(2006, 6, 21), this_season.begin
+    assert_equal Time.local(2006, 8, 16), this_season.end
+  end
+
+end

data/test/test_Time.rb

@@ -31,7 +31,7 @@ class TestTime < Test::Unit::TestCase
     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, 5), Time.construct(2000, 2, 33)
+    assert_equal Time.local(2000, 3, 4), Time.construct(2000, 2, 33)
 
     assert_nothing_raised do
       Time.construct(2006, 1, 56)

data/test/test_parsing.rb

@@ -8,8 +8,21 @@ class TestParsing < Test::Unit::TestCase
     @time_2006_08_16_14_00_00 = TIME_2006_08_16_14_00_00
   end
 
-  def test_parse_guess_dates
-    # rm_sd
+  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
+
+    time = parse_now("aug 3", :context => :past)
+    assert_equal Time.local(2006, 8, 3, 12), time
+
+    time = parse_now("aug 20")
+    assert_equal Time.local(2006, 8, 20, 12), time
+
+    time = parse_now("aug 20", :context => :future)
+    assert_equal Time.local(2006, 8, 20, 12), time
 
     time = parse_now("may 27")
     assert_equal Time.local(2007, 5, 27, 12), time
@@ -25,23 +38,9 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("may 28 at 5:32.19pm", :context => :past)
     assert_equal Time.local(2006, 5, 28, 17, 32, 19), time
+  end
 
-    # rm_sd for current month
-
-    time = parse_now("aug 3")
-    assert_equal Time.local(2006, 8, 3, 12), time
-
-    time = parse_now("aug 3", :context => :past)
-    assert_equal Time.local(2006, 8, 3, 12), time
-
-    time = parse_now("aug 20")
-    assert_equal Time.local(2006, 8, 20, 12), time
-
-    time = parse_now("aug 20", :context => :future)
-    assert_equal Time.local(2006, 8, 20, 12), time
-
-    # rm_sd_on
-
+  def test_handle_rmn_sd_on
     time = parse_now("5pm on may 28")
     assert_equal Time.local(2007, 5, 28, 17), time
 
@@ -50,9 +49,9 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("5 on may 28", :ambiguous_time_range => :none)
     assert_equal Time.local(2007, 5, 28, 05), time
+  end
 
-    # rm_od
-
+  def test_handle_rmn_od
     time = parse_now("may 27th")
     assert_equal Time.local(2007, 5, 27, 12), time
 
@@ -67,9 +66,20 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("may 27th at 5", :ambiguous_time_range => :none)
     assert_equal Time.local(2007, 5, 27, 5), time
+  end
+
+  def test_handle_od_rmn
+    time = parse_now("22nd February")
+    assert_equal Time.local(2007, 2, 22, 12), time
 
-    # rm_od_on
+    time = parse_now("31st of may at 6:30pm")
+    assert_equal Time.local(2007, 5, 31, 18, 30), time
 
+    time = parse_now("11th december 8am")
+    assert_equal Time.local(2006, 12, 11, 8), time
+  end
+
+  def test_handle_rmn_od_on
     time = parse_now("5:00 pm may 27th", :context => :past)
     assert_equal Time.local(2006, 5, 27, 17), time
 
@@ -81,16 +91,65 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("5 on may 27th", :ambiguous_time_range => :none)
     assert_equal Time.local(2007, 5, 27, 5), time
+  end
 
-    # rm_sy
+  def test_handle_rmn_sy
+    time = parse_now("may 97")
+    assert_equal Time.local(1997, 5, 16, 12), time
 
-    time = parse_now("June 1979")
-    assert_equal Time.local(1979, 6, 16, 0), time
+    time = parse_now("may 33", :ambiguous_year_future_bias => 10)
+    assert_equal Time.local(2033, 5, 16, 12), time
 
-    time = parse_now("dec 79")
-    assert_equal Time.local(1979, 12, 16, 12), time
+    time = parse_now("may 32")
+    assert_equal Time.local(2032, 5, 16, 12, 0, 0), time
+  end
 
-    # rm_od_sy
+  def test_handle_rdn_rmn_sd_t_tz_sy
+    time = parse_now("Mon Apr 02 17:00:00 PDT 2007")
+    assert_equal 1175558400, 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
+
+    time = parse_now("Jan 1,2010")
+    assert_equal Time.local(2010, 1, 1, 12), time
+
+    time = parse_now("February 14, 2004")
+    assert_equal Time.local(2004, 2, 14, 12), time
+
+    time = parse_now("jan 3 2010")
+    assert_equal Time.local(2010, 1, 3, 12), time
+
+    time = parse_now("jan 3 2010 midnight")
+    assert_equal Time.local(2010, 1, 4, 0), time
+
+    time = parse_now("jan 3 2010 at midnight")
+    assert_equal Time.local(2010, 1, 4, 0), time
+
+    time = parse_now("jan 3 2010 at 4", :ambiguous_time_range => :none)
+    assert_equal Time.local(2010, 1, 3, 4), time
+
+    time = parse_now("may 27, 1979")
+    assert_equal Time.local(1979, 5, 27, 12), time
+
+    time = parse_now("may 27 79")
+    assert_equal Time.local(1979, 5, 27, 12), time
+
+    time = parse_now("may 27 79 4:30")
+    assert_equal Time.local(1979, 5, 27, 16, 30), time
+
+    time = parse_now("may 27 79 at 4:30", :ambiguous_time_range => :none)
+    assert_equal Time.local(1979, 5, 27, 4, 30), time
+
+    time = parse_now("may 27 32")
+    assert_equal Time.local(2032, 5, 27, 12, 0, 0), time
+  end
+
+  def test_handle_rmn_od_sy
+    time = parse_now("may 1st 01")
+    assert_equal Time.local(2001, 5, 1, 12), time
 
     time = parse_now("November 18th 2010")
     assert_equal Time.local(2010, 11, 18, 12), time
@@ -121,44 +180,17 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("March 30th 79 at 4:30", :ambiguous_time_range => :none)
     assert_equal Time.local(1979, 3, 30, 4, 30), time
+  end
 
-    # rm_sd_sy
-
-    time = parse_now("November 18, 2010")
-    assert_equal Time.local(2010, 11, 18, 12), time
-
-    time = parse_now("February 14, 2004")
-    assert_equal Time.local(2004, 2, 14, 12), time
-
-    time = parse_now("jan 3 2010")
-    assert_equal Time.local(2010, 1, 3, 12), time
-
-    time = parse_now("jan 3 2010 midnight")
-    assert_equal Time.local(2010, 1, 4, 0), time
-
-    time = parse_now("jan 3 2010 at midnight")
-    assert_equal Time.local(2010, 1, 4, 0), time
-
-    time = parse_now("jan 3 2010 at 4", :ambiguous_time_range => :none)
-    assert_equal Time.local(2010, 1, 3, 4), time
-
-    #time = parse_now("January 12, '00")
-    #assert_equal Time.local(2000, 1, 12, 12), time
-
-    time = parse_now("may 27, 1979")
-    assert_equal Time.local(1979, 5, 27, 12), time
-
-    time = parse_now("may 27 79")
-    assert_equal Time.local(1979, 5, 27, 12), time
-
-    time = parse_now("may 27 79 4:30")
-    assert_equal Time.local(1979, 5, 27, 16, 30), time
-
-    time = parse_now("may 27 79 at 4:30", :ambiguous_time_range => :none)
-    assert_equal Time.local(1979, 5, 27, 4, 30), time
+  def test_handle_od_rmn_sy
+    time = parse_now("22nd February 2012")
+    assert_equal Time.local(2012, 2, 22, 12), time
 
-    # sd_rm_sy
+    time = parse_now("11th december 79")
+    assert_equal Time.local(1979, 12, 11, 12), time
+  end
 
+  def test_handle_sd_rmn_sy
     time = parse_now("3 jan 2010")
     assert_equal Time.local(2010, 1, 3, 12), time
 
@@ -167,36 +199,25 @@ class TestParsing < Test::Unit::TestCase
 
     time = parse_now("27 Oct 2006 7:30pm")
     assert_equal Time.local(2006, 10, 27, 19, 30), time
+  end
 
-    # sm_sd_sy
-
+  def test_handle_sm_sd_sy
     time = parse_now("5/27/1979")
     assert_equal Time.local(1979, 5, 27, 12), time
 
     time = parse_now("5/27/1979 4am")
     assert_equal Time.local(1979, 5, 27, 4), time
+  end
 
-    # sd_sm_sy
-
+  def test_handle_sd_sm_sy
     time = parse_now("27/5/1979")
     assert_equal Time.local(1979, 5, 27, 12), time
 
     time = parse_now("27/5/1979 @ 0700")
     assert_equal Time.local(1979, 5, 27, 7), time
+  end
 
-    # 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
-
-    # sy_sm_sd
-
+  def test_handle_sy_sm_sd
     time = parse_now("2000-1-1")
     assert_equal Time.local(2000, 1, 1, 12), time
 
@@ -218,43 +239,73 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("2006-08-20 15:30.30")
     assert_equal Time.local(2006, 8, 20, 15, 30, 30), time
 
-    # rdn_rm_rd_rt_rtz_ry
+    time = parse_now("1902-08-20")
+    assert_equal Time.local(1902, 8, 20, 12, 0, 0), time
+  end
 
-    time = parse_now("Mon Apr 02 17:00:00 PDT 2007")
-    assert_equal 1175558400, time.to_i
+  def test_handle_sm_sy
+    time = parse_now("05/06")
+    assert_equal Time.local(2006, 5, 16, 12), time
 
-    now = Time.now
-    time = parse_now(now.to_s)
-    # assert_equal now.to_s, time.to_s
+    time = parse_now("12/06")
+    assert_equal Time.local(2006, 12, 16, 12), time
 
-    # rm_sd_rt
+    time = parse_now("13/06")
+    assert_equal nil, time
+  end
 
-    #time = parse_now("jan 5 13:00")
-    #assert_equal Time.local(2007, 1, 5, 13), time
+  def test_handle_r
+  end
 
-    # old dates
+  def test_handle_r_g_r
+  end
 
-    time = parse_now("may 40")
-    assert_equal Time.local(2040, 5, 16, 12, 0, 0), time
+  def test_handle_srp
+  end
 
-    time = parse_now("may 27 40")
-    assert_equal Time.local(2040, 5, 27, 12, 0, 0), time
+  def test_handle_s_r_p
+  end
 
-    time = parse_now("1800-08-20")
-    assert_equal Time.local(1800, 8, 20, 12, 0, 0), time
+  def test_handle_p_s_r
   end
 
-  def test_parse_two_digit_years
-    time = parse_now("may 97")
-    assert_equal Time.local(1997, 5, 16, 12), time
+  def test_handle_s_r_p_a
+  end
 
-    time = parse_now("may 1st 01")
-    assert_equal Time.local(2001, 5, 1, 12), time
+  def test_handle_orr
+  end
+
+  def test_handle_o_r_s_r
+    time = parse_now("3rd wednesday in november")
+    assert_equal Time.local(2006, 11, 15, 12), time
 
-    time = parse_now("may 79", :ambiguous_year_future_bias => 10)
-    assert_equal Time.local(2079, 5, 16, 12), time
+    time = parse_now("10th wednesday in november")
+    assert_equal nil, time
+
+    # time = parse_now("3rd wednesday in 2007")
+    # assert_equal Time.local(2007, 1, 20, 12), time
   end
 
+  def test_handle_o_r_g_r
+    time = parse_now("3rd month next year", :guess => false)
+    assert_equal Time.local(2007, 3), time.begin
+
+    time = parse_now("3rd month next year", :guess => false)
+    assert_equal Time.local(2007, 3, 1), time.begin
+
+    time = parse_now("3rd thursday this september")
+    assert_equal Time.local(2006, 9, 21, 12), time
+
+    now = Time.parse("1/10/2010")
+    time = parse_now("3rd thursday this november", :now => now)
+    assert_equal Time.local(2010, 11, 18, 12), time
+
+    time = parse_now("4th day last week")
+    assert_equal Time.local(2006, 8, 9, 12), time
+  end
+
+  # end of testing handlers
+
   def test_parse_guess_r
     time = parse_now("friday")
     assert_equal Time.local(2006, 8, 18, 12), time
@@ -649,17 +700,6 @@ class TestParsing < Test::Unit::TestCase
     # future
   end
 
-  def test_parse_guess_o_r_s_r
-    time = parse_now("3rd wednesday in november")
-    assert_equal Time.local(2006, 11, 15, 12), time
-
-    time = parse_now("10th wednesday in november")
-    assert_equal nil, time
-
-    # time = parse_now("3rd wednesday in 2007")
-    # assert_equal Time.local(2007, 1, 20, 12), time
-  end
-
   def test_parse_guess_o_r_g_r
     time = parse_now("3rd month next year", :guess => false)
     assert_equal Time.local(2007, 3), time.begin

metadata

@@ -1,32 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chronic
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.4
 platform: ruby
-authors: 
+authors:
 - Tom Preston-Werner
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-12 00:00:00 Z
+date: 2011-07-01 00:00:00.000000000 +01:00
+default_executable: 
 dependencies: []
-
 description: Chronic is a natural language date/time parser written in pure Ruby.
-email: 
+email:
 - tom@mojombo.com
 - lee@jarvis.co
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - HISTORY.md
 - LICENSE
-files: 
+files:
 - .gemtest
 - .gitignore
 - .yardopts
@@ -62,6 +59,7 @@ files:
 - 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
@@ -79,6 +77,7 @@ files:
 - 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
@@ -88,34 +87,33 @@ files:
 - test/test_Time.rb
 - test/test_Token.rb
 - test/test_parsing.rb
+has_rdoc: true
 homepage: http://github.com/mojombo/chronic
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: chronic
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Natural language date/time parsing.
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_Chronic.rb
 - test/test_DaylightSavings.rb
@@ -128,6 +126,7 @@ test_files:
 - 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