chronic 0.6.3 → 0.6.4

data/HISTORY.md

@@ -1,3 +1,10 @@
+# 0.6.4 / 2011-08-08
+
+* Fixed bug where 'noon' was parsed as 00:00 rather than 12:00
+  with :ambiguous_time_range => :none (Vladimir Chernis)
+* Add support for handling '2009 May 22nd'
+* Add the ability to handle scalar-day/repeater-month-name as well as ordinals
+
 # 0.6.3 / 2011-08-01
 
 * Ensure 'thu' is parsed as Thursday for 1.8.7 generic timestamp

data/Rakefile

@@ -5,11 +5,9 @@ def version
   contents[/VERSION = "([^"]+)"/, 1]
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+task :test do
+  $:.unshift './test'
+  Dir.glob('test/test_*.rb').each { |t| require File.basename(t) }
 end
 
 desc "Generate RCov test coverage and open in your browser"

data/lib/chronic.rb

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

data/lib/chronic/chronic.rb

@@ -118,7 +118,7 @@ module Chronic
       text.gsub!(/\btoday\b/, 'this day')
       text.gsub!(/\btomm?orr?ow\b/, 'next day')
       text.gsub!(/\byesterday\b/, 'last day')
-      text.gsub!(/\bnoon\b/, '12:00')
+      text.gsub!(/\bnoon\b/, '12:00pm')
       text.gsub!(/\bmidnight\b/, '24:00')
       text.gsub!(/\bnow\b/, 'this second')
       text.gsub!(/\b(?:ago|before(?: now)?)\b/, 'past')
@@ -179,9 +179,11 @@ module Chronic
           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([:scalar_year, :repeater_month_name, :ordinal_day], :handle_sy_rmn_od),
           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),
+          Handler.new([:scalar_day, :repeater_month_name, :separator_at?, 'time?'], :handle_sd_rmn),
           Handler.new([:scalar_year, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar_day, :separator_at?, 'time?'], :handle_sy_sm_sd),
           Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_year], :handle_sm_sy)
         ],

data/lib/chronic/handlers.rb

@@ -59,6 +59,32 @@ module Chronic
       handle_m_d(month, day, tokens[2..tokens.size], options)
     end
 
+    def handle_sy_rmn_od(tokens, options)
+      year = tokens[0].get_tag(ScalarYear).type
+      month = tokens[1].get_tag(RepeaterMonthName).index
+      day = tokens[2].get_tag(OrdinalDay).type
+      time_tokens = tokens.last(tokens.size - 3)
+
+      return if month_overflow?(year, month, day)
+
+      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
+    def handle_sd_rmn(tokens, options)
+      month = tokens[1].get_tag(RepeaterMonthName)
+      day = tokens[0].get_tag(ScalarDay).type
+
+      return if month_overflow?(Chronic.now.year, month.index, day)
+
+      handle_m_d(month, day, tokens[2..tokens.size], options)
+    end
+
     # Handle repeater-month-name/ordinal-day with separator-on
     def handle_rmn_od_on(tokens, options)
       if tokens.size > 3
@@ -339,7 +365,11 @@ module Chronic
         raise ChronicPain, "Invalid grabber"
       end
 
-      puts "--#{outer_span}" if Chronic.debug
+      if Chronic.debug
+        puts "Handler-class: #{head.class}"
+        puts "--#{outer_span}"
+      end
+
       find_within(repeaters, outer_span, pointer)
     end
 

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -3,10 +3,10 @@ module Chronic
     PORTIONS = {
       :am => 0..(12 * 60 * 60 - 1),
       :pm => (12 * 60 * 60)..(24 * 60 * 60 - 1),
-      :morning => (6 * 60 * 60)..(12 * 60 * 60),   # 6am-12am,
-      :afternoon =>(13 * 60 * 60)..(17 * 60 * 60), # 1pm-5pm,
-      :evening => (17 * 60 * 60)..(20 * 60 * 60),  # 5pm-8pm,
-      :night =>(20 * 60 * 60)..(24 * 60 * 60),     # 8pm-12pm
+      :morning => (6 * 60 * 60)..(12 * 60 * 60),    # 6am-12am,
+      :afternoon => (13 * 60 * 60)..(17 * 60 * 60), # 1pm-5pm,
+      :evening => (17 * 60 * 60)..(20 * 60 * 60),   # 5pm-8pm,
+      :night => (20 * 60 * 60)..(24 * 60 * 60),     # 8pm-12pm
     }
 
     def initialize(type)

data/lib/chronic/repeaters/repeater_time.rb

@@ -31,25 +31,25 @@ module Chronic
 
       @type =
       case t.size
-        when 1..2
-          hours = t.to_i
-          hours == 12 ? Tick.new(0 * 60 * 60, true) : Tick.new(hours * 60 * 60, true)
-        when 3
-          hours = t[0..0].to_i
-          ambiguous = hours > 0
-          Tick.new((hours * 60 * 60) + (t[1..2].to_i * 60), ambiguous)
-        when 4
-          ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-          hours = t[0..1].to_i
-          hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60, ambiguous)
-        when 5
-          Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
-        when 6
-          ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-          hours = t[0..1].to_i
-          hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
-        else
-          raise("Time cannot exceed six digits")
+      when 1..2
+        hours = t.to_i
+        Tick.new((hours == 12 ? 0 : hours) * 60 * 60, true)
+      when 3
+        hours = t[0..0].to_i
+        ambiguous = hours > 0
+        Tick.new((hours * 60 * 60) + (t[1..2].to_i * 60), ambiguous)
+      when 4
+        ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
+        hours = t[0..1].to_i
+        hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60, ambiguous)
+      when 5
+        Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
+      when 6
+        ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
+        hours = t[0..1].to_i
+        hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
+      else
+        raise("Time cannot exceed six digits")
       end
     end
 

data/lib/chronic/repeaters/repeater_year.rb

@@ -29,7 +29,7 @@ module Chronic
 
       case pointer
       when :future
-        this_year_start = Chronic.construct(@now.year, @now.month, @now.day) + RepeaterDay::DAY_SECONDS
+        this_year_start = Chronic.construct(@now.year, @now.month, @now.day + 1)
         this_year_end = Chronic.construct(@now.year + 1, 1, 1)
       when :past
         this_year_start = Chronic.construct(@now.year, 1, 1)

data/test/helper.rb

@@ -1,5 +1,5 @@
 unless defined? Chronic
-  $:.unshift File.expand_path('../../lib')
+  $:.unshift File.expand_path('../../lib', __FILE__)
   require 'chronic'
 end
 

data/test/test_parsing.rb

@@ -76,6 +76,22 @@ class TestParsing < Test::Unit::TestCase
     assert_equal Time.local(2006, 12, 11, 8), time
   end
 
+  def test_handle_sy_rmn_od
+    time = parse_now("2009 May 22nd")
+    assert_equal Time.local(2009, 05, 22, 12), time
+  end
+
+  def test_handle_sd_rmn
+    time = parse_now("22 February")
+    assert_equal Time.local(2007, 2, 22, 12), time
+
+    time = parse_now("31 of may at 6:30pm")
+    assert_equal Time.local(2007, 5, 31, 18, 30), time
+
+    time = parse_now("11 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
@@ -417,11 +433,11 @@ class TestParsing < Test::Unit::TestCase
   def test_parse_guess_gr
     # year
 
-    time = parse_now("this year")
-    assert_equal Time.local(2006, 10, 24, 12, 30), time
+    time = parse_now("this year", :guess => false)
+    assert_equal Time.local(2006, 8, 17), time.begin
 
-    time = parse_now("this year", :context => :past)
-    assert_equal Time.local(2006, 4, 24, 12, 30), time
+    time = parse_now("this year", :context => :past, :guess => false)
+    assert_equal Time.local(2006, 1, 1), time.begin
 
     # month
 
@@ -858,6 +874,11 @@ class TestParsing < Test::Unit::TestCase
     assert_not_equal t1, t2
   end
 
+  def test_noon
+    t1 = Chronic.parse('2011-01-01 at noon', :ambiguous_time_range => :none)
+    assert_equal Time.local(2011, 1, 1, 12, 0), t1
+  end
+
   private
   def parse_now(string, options={})
     Chronic.parse(string, {:now => TIME_2006_08_16_14_00_00 }.merge(options))

metadata

@@ -1,37 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chronic
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.6.4
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 3
-  version: 0.6.3
 platform: ruby
-authors: 
+authors:
 - Tom Preston-Werner
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-02 00:00:00 Z
+date: 2011-09-09 00:00:00.000000000Z
 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
@@ -96,38 +87,30 @@ files:
 - test/test_parsing.rb
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: chronic
 rubygems_version: 1.8.6
 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