chronic 0.6.4 → 0.6.5

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 0.6.5 / 2011-11-04
+
+* Fix bug when parsing ordinal repeaters (#73)
+* Added handler support for day_name month_name (@imme5150)
+* Fix bug when parsing strings prefixed with PM
+
 # 0.6.4 / 2011-08-08
 
 * Fixed bug where 'noon' was parsed as 00:00 rather than 12:00

data/README.md

@@ -162,14 +162,13 @@ If you'd like to hack on Chronic, start by forking the repo on GitHub:
 
 https://github.com/mojombo/chronic
 
-To get all of the dependencies, install the gem first. The best way to get
-your changes merged back into core is as follows:
+The best way to get your changes merged back into core is as follows:
 
 1. Clone down your fork
 1. Create a thoughtfully named topic branch to contain your change
 1. Hack away
 1. Add tests and make sure everything still passes by running `rake`
-1. Ensure your tests pass in multiple timezones
+1. Ensure your tests pass in multiple timezones. ie `TZ=utc rake` `TZ=BST rake`
 1. If you are adding new functionality, document it in the README
 1. Do not change the version number, we will do that on our end
 1. If necessary, rebase your commits into logical chunks, without errors

data/lib/chronic.rb

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

data/lib/chronic/chronic.rb

@@ -114,7 +114,7 @@ module Chronic
       text = Numerizer.numerize(text)
       text.gsub!(/ \-(\d{4})\b/, ' tzminus\1')
       text.gsub!(/([\/\-\,\@])/) { ' ' + $1 + ' ' }
-      text.gsub!(/\b0(\d+:\d+\s*pm?\b)/, '\1')
+      text.gsub!(/(?:^|\s)0(\d+:\d+\s*pm?\b)/, '\1')
       text.gsub!(/\btoday\b/, 'this day')
       text.gsub!(/\btomm?orr?ow\b/, 'next day')
       text.gsub!(/\byesterday\b/, 'last day')
@@ -169,6 +169,8 @@ 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, :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),
           Handler.new([:repeater_month_name, :ordinal_day, :scalar_year], :handle_rmn_od_sy),

data/lib/chronic/handlers.rb

@@ -245,6 +245,40 @@ module Chronic
       end
     end
 
+    # Handle RepeaterDayName RepeaterMonthName OrdinalDay
+    def handle_rdn_rmn_od(tokens, options)
+      month = tokens[1].get_tag(RepeaterMonthName)
+      day = tokens[2].get_tag(OrdinalDay).type
+      year = Chronic.now.year
+
+      return if month_overflow?(year, month.index, day)
+
+      begin
+        start_time = Chronic.time_class.local(year, month.index, day)
+        end_time = Chronic.time_class.local(year, month.index, day + 1)
+        Span.new(start_time, end_time)
+      rescue ArgumentError
+        nil
+      end
+    end
+
+    # Handle RepeaterDayName RepeaterMonthName ScalarDay
+    def handle_rdn_rmn_sd(tokens, options)
+      month = tokens[1].get_tag(RepeaterMonthName)
+      day = tokens[2].get_tag(ScalarDay).type
+      year = Chronic.now.year
+
+      return if month_overflow?(year, month.index, day)
+
+      begin
+        start_time = Chronic.time_class.local(year, month.index, day)
+        end_time = Chronic.time_class.local(year, month.index, day + 1)
+        Span.new(start_time, end_time)
+      rescue ArgumentError
+        nil
+      end
+    end
+
     # anchors
 
     # Handle repeaters
@@ -302,7 +336,7 @@ module Chronic
       ordinal.times do
         span = repeater.next(:future)
 
-        if span.begin > outer_span.end
+        if span.begin >= outer_span.end
           span = nil
           break
         end

data/test/test_parsing.rb

@@ -238,6 +238,9 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("7/12/11", :endian_precedence => :little)
     assert_equal Time.local(2011, 12, 7, 12), time
 
+    time = parse_now("9/19/2011 6:05:57 PM")
+    assert_equal Time.local(2011, 9, 19, 18, 05, 57), time
+
     # month day overflows
     time = parse_now("30/2/2000")
     assert_nil time
@@ -307,6 +310,19 @@ class TestParsing < Test::Unit::TestCase
   end
 
   def test_handle_orr
+    time = parse_now("5th tuesday in january")
+    assert_equal Time.local(2007, 01, 30, 12), time
+
+    time = parse_now("5th tuesday in february")
+    assert_equal nil, time
+
+    %W(jan feb march april may june july aug sep oct nov dec).each_with_index do |month, index|
+      time = parse_now("5th tuesday in #{month}")
+
+      if time then
+        assert_equal time.month, index+1
+      end
+    end
   end
 
   def test_handle_o_r_s_r
@@ -879,6 +895,16 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2011, 1, 1, 12, 0), t1
   end
 
+  def test_handle_rdn_rmn_sd
+    time = parse_now("Thu Aug 10")
+    assert_equal Time.local(2006, 8, 10, 12), time
+  end
+
+  def test_handle_rdn_rmn_od
+    time = parse_now("Thu Aug 10th")
+    assert_equal Time.local(2006, 8, 10, 12), time
+  end
+
   private
   def parse_now(string, options={})
     Chronic.parse(string, {:now => TIME_2006_08_16_14_00_00 }.merge(options))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-11-05 00:00:00.000000000Z
 dependencies: []
 description: Chronic is a natural language date/time parser written in pure Ruby.
 email:
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: chronic
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Natural language date/time parsing.