chronic 0.2.2 → 0.2.3

data/History.txt

@@ -1,6 +1,10 @@
+= 0.2.3
+
+* fixed 12am/12pm (by Nicholas Schlueter)
+
 = 0.2.2
 
-* added missing files (damn you manifest!)
+* added missing files (damn you manifest)
 
 = 0.2.1
 

data/lib/chronic.rb

@@ -39,7 +39,7 @@ require 'chronic/time_zone'
 require 'numerizer/numerizer'
 
 module Chronic
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
   
   def self.debug; false; end
 end

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -10,8 +10,8 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
     if type.kind_of? Integer
       @range = (@type * 60 * 60)..((@type + 12) * 60 * 60)
     else
-      lookup = {:am => 1..(12 * 60 * 60),
-                :pm => (12 * 60 * 60)..(24 * 60 * 60),
+      lookup = {:am => 0..(12 * 60 * 60 - 1),
+                :pm => (12 * 60 * 60)..(24 * 60 * 60 - 1),
                 :morning => @@morning,
                 :afternoon => @@afternoon,
                 :evening => @@evening,

data/lib/chronic/repeaters/repeater_time.rb

@@ -28,17 +28,20 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
     t = time.gsub(/\:/, '')
     @type = 
     if (1..2) === t.size
-      Tick.new(t.to_i * 60 * 60, true)
+      hours = t.to_i
+      hours == 12 ? Tick.new(0 * 60 * 60, true) : Tick.new(hours * 60 * 60, true)
     elsif t.size == 3
       Tick.new((t[0..0].to_i * 60 * 60) + (t[1..2].to_i * 60), true)
     elsif t.size == 4
       ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-      Tick.new(t[0..1].to_i * 60 * 60 + t[2..3].to_i * 60, ambiguous)
+      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)
     elsif t.size == 5
       Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
     elsif t.size == 6
       ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-      Tick.new(t[0..1].to_i * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
+      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
@@ -65,21 +68,21 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
         if pointer == :future
           if @type.ambiguous?
             [midnight + @type, midnight + half_day + @type, tomorrow_midnight + @type].each do |t|
-              (@current_time = t; throw :done) if t > @now
+              (@current_time = t; throw :done) if t >= @now
             end
           else
             [midnight + @type, tomorrow_midnight + @type].each do |t|
-              (@current_time = t; throw :done) if t > @now
+              (@current_time = t; throw :done) if t >= @now
             end
           end
         else # pointer == :past
           if @type.ambiguous?
             [midnight + half_day + @type, midnight + @type, yesterday_midnight + @type * 2].each do |t|
-              (@current_time = t; throw :done) if t < @now
+              (@current_time = t; throw :done) if t <= @now
             end
           else
             [midnight + @type, yesterday_midnight + @type].each do |t|
-              (@current_time = t; throw :done) if t < @now
+              (@current_time = t; throw :done) if t <= @now
             end
           end
         end

data/test/test_parsing.rb

@@ -1,4 +1,5 @@
 require 'chronic'
+require 'time'
 require 'test/unit'
 
 class TestParsing < Test::Unit::TestCase
@@ -208,6 +209,18 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("4 am", :ambiguous_time_range => :none)
     assert_equal Time.local(2006, 8, 16, 4), time
     
+    time = parse_now("12 pm")
+    assert_equal Time.local(2006, 8, 16, 12), time
+    
+    time = parse_now("12:01 pm")
+    assert_equal Time.local(2006, 8, 16, 12, 1), time
+    
+    time = parse_now("12:01 am")
+    assert_equal Time.local(2006, 8, 16, 0, 1), time
+    
+    time = parse_now("12 am")
+    assert_equal Time.local(2006, 8, 16), time
+    
     time = parse_now("4:00 in the morning")
     assert_equal Time.local(2006, 8, 16, 4), time
     
@@ -411,6 +424,12 @@ class TestParsing < Test::Unit::TestCase
     
     time = parse_now("tomorrow morning at 5:30")
     assert_equal Time.local(2006, 8, 17, 5, 30), time
+    
+    time = parse_now("next monday at 12:01 am")
+    assert_equal Time.local(2006, 8, 21, 00, 1), time
+    
+    time = parse_now("next monday at 12:01 pm")
+    assert_equal Time.local(2006, 8, 21, 12, 1), time
   end
   
   def test_parse_guess_rgr
@@ -531,6 +550,9 @@ class TestParsing < Test::Unit::TestCase
     
     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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: chronic
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-04-21 00:00:00 -07:00
+  version: 0.2.3
+date: 2007-07-02 00:00:00 -07:00
 summary: A natural language date parser
 require_paths: 
 - lib
@@ -93,10 +93,13 @@ test_files:
 - test/test_Span.rb
 - test/test_Time.rb
 - test/test_Token.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 executables: []
 
 extensions: []
@@ -111,5 +114,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: