chronic 0.6.6 → 0.6.7

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 rdoc
 .yardoc
 doc
+tags

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.6.7 / 2012-01-31
+
+* Handle day, month names with scalar day and year (Joe Fiorini)
+* Ensure 31st parses correctly with day names (Joe Fiorini)
+
 # 0.6.6 / 2011-11-23
 
 * `Chronic.parse('thur')` no longer returns `nil` (@harold)

data/lib/chronic.rb

@@ -28,7 +28,7 @@ require 'date'
 #
 # @author Tom Preston-Werner, Lee Jarvis
 module Chronic
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 
   class << self
 

data/lib/chronic/chronic.rb

@@ -170,6 +170,7 @@ module Chronic
         :date => [
           Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day, :repeater_time, :separator_slash_or_dash?, :time_zone, :scalar_year], :handle_rdn_rmn_sd_t_tz_sy),
           Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day], :handle_rdn_rmn_sd),
+          Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day, :scalar_year], :handle_rdn_rmn_sd_sy),
           Handler.new([:repeater_day_name, :repeater_month_name, :ordinal_day], :handle_rdn_rmn_od),
           Handler.new([:scalar_year, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar_day, :repeater_time, :time_zone], :handle_sy_sm_sd_t_tz),
           Handler.new([:repeater_month_name, :scalar_day, :scalar_year], :handle_rmn_sd_sy),

data/lib/chronic/handlers.rb

@@ -255,7 +255,7 @@ module Chronic
 
       begin
         start_time = Chronic.time_class.local(year, month.index, day)
-        end_time = Chronic.time_class.local(year, month.index, day + 1)
+        end_time = time_with_rollover(year, month.index, day + 1)
         Span.new(start_time, end_time)
       rescue ArgumentError
         nil
@@ -272,7 +272,24 @@ module Chronic
 
       begin
         start_time = Chronic.time_class.local(year, month.index, day)
-        end_time = Chronic.time_class.local(year, month.index, day + 1)
+        end_time = time_with_rollover(year, month.index, day + 1)
+        Span.new(start_time, end_time)
+      rescue ArgumentError
+        nil
+      end
+    end
+
+    # Handle RepeaterDayName RepeaterMonthName ScalarDay ScalarYear
+    def handle_rdn_rmn_sd_sy(tokens, options)
+      month = tokens[1].get_tag(RepeaterMonthName)
+      day = tokens[2].get_tag(ScalarDay).type
+      year = tokens[3].get_tag(ScalarYear).type
+
+      return if month_overflow?(year, month.index, day)
+
+      begin
+        start_time = Chronic.time_class.local(year, month.index, day)
+        end_time = time_with_rollover(year, month.index, day + 1)
         Span.new(start_time, end_time)
       rescue ArgumentError
         nil
@@ -435,6 +452,20 @@ module Chronic
       end
     end
 
+    def time_with_rollover(year, month, day)
+      date_parts =
+        if month_overflow?(year, month, day)
+          if month == 12
+            [year + 1, 1, 1]
+          else
+            [year, month + 1, 1]
+          end
+        else
+          [year, month, day]
+        end
+      Chronic.time_class.local(*date_parts)
+    end
+
     def dealias_and_disambiguate_times(tokens, options)
       # handle aliases of am/pm
       # 5:00 in the morning -> 5:00 am

data/test/test_parsing.rb

@@ -926,11 +926,37 @@ class TestParsing < Test::Unit::TestCase
   def test_handle_rdn_rmn_sd
     time = parse_now("Thu Aug 10")
     assert_equal Time.local(2006, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31")
+    assert_equal Time.local(2006, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31")
+    assert_equal Time.local(2006, 12, 31, 12), time
+  end
+
+  def test_handle_rdn_rmn_sd_sy
+    time = parse_now("Thu Aug 10 2006")
+    assert_equal Time.local(2006, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31 2006")
+    assert_equal Time.local(2006, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31 2006")
+    assert_equal Time.local(2006, 12, 31, 12), time
+
+    time = parse_now("Thursday December 30 2006")
+    assert_equal Time.local(2006, 12, 30, 12), time
   end
 
   def test_handle_rdn_rmn_od
     time = parse_now("Thu Aug 10th")
     assert_equal Time.local(2006, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31st")
+    assert_equal Time.local(2006, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31st")
+    assert_equal Time.local(2006, 12, 31, 12), time
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Chronic is a natural language date/time parser written in pure Ruby.
 email: