chronic 0.9.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7033fa51e89c8552e935aab7ee0bb5673338d063
+  data.tar.gz: 21a09efad9e8da2dcd3ed32a5c8605707f36abc7
+SHA512:
+  metadata.gz: f3d63e888e712dad2b0d4c70d11688607e56a3d1b4ac11632e14b3f23a57f21a2fd32403f50cf13002a9859607a89e6521b5c39f4ec003edd5631791cf7cf409
+  data.tar.gz: 9e2d80dcf087643ce865ede613dbd2d006942b1986e46c02f75b012711ee79bb74f0b576ba812d8b54ab599411213548effc036cc888c97b82c70fdf21627365

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - jruby-19mode
+  - jruby-18mode
+  - rbx-19mode

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 0.9.1 / 2013-02-25
+
+* Ensure Chronic strips periods from day portions (#173)
+* Properly numerize "twelfth", "twentieth" etc. (#172, James McKinney)
+* Ensure Chronic is compatible with Ruby 2.0.0 (#165, Ravil Bayramgalin)
+
 # 0.9.0 / 2012-12-21
 
 * Implement Chronic::Parser class and create an instance of this class

data/lib/chronic.rb

@@ -13,7 +13,6 @@ require 'chronic/grabber'
 require 'chronic/pointer'
 require 'chronic/scalar'
 require 'chronic/ordinal'
-require 'chronic/ordinal'
 require 'chronic/separator'
 require 'chronic/time_zone'
 require 'chronic/numerizer'
@@ -51,7 +50,7 @@ require 'chronic/repeaters/repeater_time'
 #   Chronic.parse('monday', :context => :past)
 #     #=> Mon Aug 21 12:00:00 PDT 2006
 module Chronic
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 
   class << self
 

data/lib/chronic/handlers.rb

@@ -250,11 +250,7 @@ module Chronic
       handle_sm_sd(new_tokens + time_tokens, options)
     end
 
-    # Handle scalar-month/scalar-year
-    def handle_sm_sy(tokens, options)
-      month = tokens[0].get_tag(ScalarMonth).type
-      year = tokens[1].get_tag(ScalarYear).type
-
+    def handle_year_and_month(year, month)
       if month == 12
         next_month_year = year + 1
         next_month_month = 1
@@ -271,6 +267,20 @@ module Chronic
       end
     end
 
+    # Handle scalar-month/scalar-year
+    def handle_sm_sy(tokens, options)
+      month = tokens[0].get_tag(ScalarMonth).type
+      year = tokens[1].get_tag(ScalarYear).type
+      handle_year_and_month(year, month)
+    end
+
+    # Handle scalar-year/scalar-month
+    def handle_sy_sm(tokens, options)
+      year = tokens[0].get_tag(ScalarYear).type
+      month = tokens[1].get_tag(ScalarMonth).type
+      handle_year_and_month(year, month)
+    end
+
     # Handle RepeaterDayName RepeaterMonthName OrdinalDay
     def handle_rdn_rmn_od(tokens, options)
       month = tokens[1].get_tag(RepeaterMonthName)
@@ -404,7 +414,6 @@ module Chronic
 
     # Handle scalar/repeater/pointer
     def handle_s_r_p(tokens, options)
-      repeater = tokens[1].get_tag(Repeater)
       span = Span.new(self.now, self.now + 1)
 
       handle_srp(tokens, span, options)

data/lib/chronic/numerizer.rb

@@ -37,7 +37,16 @@ module Chronic
       ['seventh', '7'],
       ['eighth', '8'],
       ['ninth', '9'],
-      ['tenth', '10']
+      ['tenth', '10'],
+      ['twelfth', '12'],
+      ['twentieth', '20'],
+      ['thirtieth', '30'],
+      ['fourtieth', '40'],
+      ['fiftieth', '50'],
+      ['sixtieth', '60'],
+      ['seventieth', '70'],
+      ['eightieth', '80'],
+      ['ninetieth', '90']
     ]
 
     TEN_PREFIXES = [
@@ -90,7 +99,7 @@ module Chronic
       # hundreds, thousands, millions, etc.
 
       BIG_PREFIXES.each do |bp|
-        string.gsub!(/(?:<num>)?(\d*) *#{bp[0]}/i) { '<num>' + (bp[1] * $1.to_i).to_s}
+        string.gsub!(/(?:<num>)?(\d*) *#{bp[0]}/i) { $1.empty? ? bp[1] : '<num>' + (bp[1] * $1.to_i).to_s}
         andition(string)
       end
 

data/lib/chronic/parser.rb

@@ -86,6 +86,7 @@ module Chronic
     # Returns a new String ready for Chronic to parse.
     def pre_normalize(text)
       text = text.to_s.downcase
+      text.gsub!(/\b([ap])\.m\.?/, '\1m')
       text.gsub!(/\./, ':')
       text.gsub!(/['"]/, '')
       text.gsub!(/,/, ' ')
@@ -116,6 +117,7 @@ module Chronic
       text.gsub!(/\b(hence|after|from)\b/, 'future')
       text.gsub!(/^\s?an? /i, '1 ')
       text.gsub!(/\b(\d{4}):(\d{2}):(\d{2})\b/, '\1 / \2 / \3') # DTOriginal
+      text.gsub!(/\b0(\d+):(\d{2}):(\d{2}) ([ap]m)\b/, '\1:\2:\3 \4')
       text
     end
 
@@ -171,6 +173,7 @@ module Chronic
           Handler.new([:scalar_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_sd_rmn_sy),
           Handler.new([:scalar_day, :separator_slash_or_dash?, :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_year, :separator_slash_or_dash, :scalar_month], :handle_sy_sm),
           Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_year], :handle_sm_sy),
           Handler.new([:scalar_day, :separator_slash_or_dash, :repeater_month_name, :separator_slash_or_dash, :scalar_year, :repeater_time?], :handle_sm_rmn_sy),
           Handler.new([:scalar_year, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar?, :time_zone], :handle_generic),

data/lib/chronic/span.rb

@@ -25,7 +25,7 @@ module Chronic
       '(' << self.begin.to_s << '..' << self.end.to_s << ')'
     end
 
-    alias :cover? :include? unless RUBY_VERSION =~ /^1.9/
+    alias :cover? :include? if RUBY_VERSION =~ /^1.8/
 
   end
-end
+end

data/lib/chronic/token.rb

@@ -43,5 +43,9 @@ module Chronic
     def to_s
       @word << '(' << @tags.join(', ') << ') '
     end
+
+    def inspect
+      to_s
+    end
   end
 end

data/test/test_numerizer.rb

@@ -57,6 +57,20 @@ class ParseNumbersTest < TestCase
       'second day' => '2nd day',
       'second of may' => '2nd of may',
       'fifth' => '5th',
+      'twelfth' => '12th',
+      'twentieth' => '20th',
+      'thirtieth' => '30th',
+      'fourtieth' => '40th',
+      'fiftieth' => '50th',
+      'sixtieth' => '60th',
+      'seventieth' => '70th',
+      'eightieth' => '80th',
+      'ninetieth' => '90th',
+      'hundredth' => '100th',
+      'thousandth' => '1000th',
+      'millionth' => '1000000th',
+      'billionth' => '1000000000th',
+      'trillionth' => '1000000000000th',
       'twenty third' => '23rd',
       'first day month two' => '1st day month 2'
     }.each do |key, val|

data/test/test_parsing.rb

@@ -363,12 +363,26 @@ class TestParsing < TestCase
   #   assert_equal nil, time
   # end
 
+  def test_handle_sy_sm
+    time = parse_now("2012-06")
+    assert_equal Time.local(2012, 06, 16), time
+
+    time = parse_now("2013/11")
+    assert_equal Time.local(2013, 11, 16), time
+  end
+
   def test_handle_r
     time = parse_now("9am on Saturday")
     assert_equal Time.local(2006, 8, 19, 9), time
 
     time = parse_now("on Tuesday")
     assert_equal Time.local(2006, 8, 22, 12), time
+
+    time = parse_now("1:00:00 PM")
+    assert_equal Time.local(2006, 8, 16, 13), time
+
+    time = parse_now("01:00:00 PM")
+    assert_equal Time.local(2006, 8, 16, 13), time
   end
 
   def test_handle_r_g_r
@@ -1135,6 +1149,10 @@ class TestParsing < TestCase
     assert_equal Time.local(2006, 12, 31, 12), time
   end
 
+  def test_normalizing_day_portions
+    assert_equal pre_normalize("8:00 pm February 11"), pre_normalize("8:00 p.m. February 11")
+  end
+
   private
   def parse_now(string, options={})
     Chronic.parse(string, {:now => TIME_2006_08_16_14_00_00 }.merge(options))

data/test/test_span.rb

@@ -9,7 +9,7 @@ class TestSpan < TestCase
 
   def test_span_width
     span = Chronic::Span.new(Time.local(2006, 8, 16, 0), Time.local(2006, 8, 17, 0))
-    assert_equal (60 * 60 * 24), span.width
+    assert_equal((60 * 60 * 24), span.width)
   end
 
   def test_span_math

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Chronic is a natural language date/time parser written in pure Ruby.
@@ -56,6 +51,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
+- .travis.yml
 - HISTORY.md
 - LICENSE
 - README.md
@@ -118,28 +114,27 @@ files:
 - test/test_token.rb
 homepage: http://github.com/mojombo/chronic
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: chronic
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Natural language date/time parsing.
 test_files:
 - test/helper.rb
@@ -164,4 +159,3 @@ test_files:
 - test/test_repeater_year.rb
 - test/test_span.rb
 - test/test_token.rb
-has_rdoc: