chronic 0.2.0 → 0.2.3

data/History.txt

@@ -1,11 +1,26 @@
-= 0.2.0 2007-03-20
+= 0.2.3
+
+* fixed 12am/12pm (by Nicholas Schlueter)
+
+= 0.2.2
+
+* added missing files (damn you manifest)
+
+= 0.2.1
 
 * fixed time overflow issue
-* implemented numerizer, allowing the use of number words (e.g. five weeks ago) (shalev)
+* implemented "next" for minute repeater
+* generalized time dealiasing to dealias regardless of day portion and time position
+* added additional token match for cases like "friday evening at 7" and "tomorrow evening at 7"
+* added support for Time#to_s output format: "Mon Apr 02 17:00:00 PDT 2007"
+
+= 0.2.0 2007-03-20
+
+* implemented numerizer, allowing the use of number words (e.g. five weeks ago) (by shalev)
 
 = 0.1.6 2006-01-15
 
-* added 'weekend' support (eventualbuddha)
+* added 'weekend' support (by eventualbuddha)
 
 = 0.1.5 2006-12-20
 
@@ -20,7 +35,7 @@
 
 = 0.1.3
 
-* improved regexes for word variations (Josh Goebel)
+* improved regexes for word variations (by Josh Goebel)
 * fixed a bug that caused "today at 3am" to return nil if current time is after 3am
 
 = 0.1.2

data/Manifest.txt

@@ -26,6 +26,7 @@ lib/chronic/repeaters/repeater_weekend.rb
 lib/chronic/repeaters/repeater_year.rb
 lib/chronic/scalar.rb
 lib/chronic/separator.rb
+lib/chronic/time_zone.rb
 lib/numerizer/numerizer.rb
 test/suite.rb
 test/test_Chronic.rb
@@ -41,5 +42,6 @@ test/test_RepeaterWeek.rb
 test/test_RepeaterWeekend.rb
 test/test_RepeaterYear.rb
 test/test_Span.rb
+test/test_Time.rb
 test/test_Token.rb
 test/test_parsing.rb

data/Rakefile

@@ -7,6 +7,8 @@ require './lib/chronic.rb'
 Hoe.new('chronic', Chronic::VERSION) do |p|
   p.rubyforge_name = 'chronic'
   p.summary = 'A natural language date parser'
+  p.author = 'Tom Preston-Werner'
+  p.email = 'tom@rubyisawesome.com'
   p.description = p.paragraphs_of('README.txt', 2).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
@@ -14,28 +16,4 @@ Hoe.new('chronic', Chronic::VERSION) do |p|
   p.extra_deps = []
 end
 
-# vim: syntax=Ruby
-
-__END__
-
-require 'rubygems'
-
-SPEC = Gem::Specification.new do |s|
-  s.name = 'chronic'
-  s.version = '0.1.5'
-  s.author = 'Tom Preston-Werner'
-  s.email = 'tom@rubyisawesome.com'
-  s.homepage = 'http://chronic.rubyforge.org'
-  s.platform = Gem::Platform::RUBY
-  s.summary = "A natural language date parser"
-  candidates = Dir["{lib,test}/**/*"]
-  s.files = candidates.delete_if do |item|
-    item.include?('.svn')
-  end
-  s.require_path = "lib"
-  s.autorequire = "chronic"
-  s.test_file = "test/suite.rb"
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README']
-  s.rdoc_options << '--main' << 'README'
-end
+# vim: syntax=Ruby

data/lib/chronic/chronic.rb

@@ -66,7 +66,7 @@ module Chronic
         @tokens = tokenizer.scan(@tokens, options)
       end
       
-      [Grabber, Pointer, Scalar, Ordinal, Separator].each do |tokenizer|
+      [Grabber, Pointer, Scalar, Ordinal, Separator, TimeZone].each do |tokenizer|
         @tokens = tokenizer.scan(@tokens)
       end
       

data/lib/chronic/handlers.rb

@@ -6,7 +6,8 @@ module Chronic
 	    @definitions ||= 
       {:time => [Handler.new([:repeater_time, :repeater_day_portion?], nil)],
         
-       :date => [Handler.new([:repeater_month_name, :scalar_day, :scalar_year], :handle_rmn_sd_sy),
+       :date => [Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day, :repeater_time, :time_zone, :scalar_year], :handle_rdn_rmn_sd_t_tz_sy),
+                 Handler.new([:repeater_month_name, :scalar_day, :scalar_year], :handle_rmn_sd_sy),
                  Handler.new([:repeater_month_name, :scalar_day, :scalar_year, :separator_at?, 'time?'], :handle_rmn_sd_sy),
                  Handler.new([:repeater_month_name, :scalar_day, :separator_at?, 'time?'], :handle_rmn_sd),
                  Handler.new([:repeater_month_name, :ordinal_day, :separator_at?, 'time?'], :handle_rmn_od),
@@ -17,13 +18,17 @@ module Chronic
                  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)],
                  
+       # tonight at 7pm
        :anchor => [Handler.new([:grabber?, :repeater, :separator_at?, :repeater?, :repeater?], :handle_r),
+                   Handler.new([:grabber?, :repeater, :repeater, :separator_at?, :repeater?, :repeater?], :handle_r),
                    Handler.new([:repeater, :grabber, :repeater], :handle_r_g_r)],
                    
+       # 3 weeks from now, in 2 months
        :arrow => [Handler.new([:scalar, :repeater, :pointer], :handle_s_r_p),
                   Handler.new([:pointer, :scalar, :repeater], :handle_p_s_r),
                   Handler.new([:scalar, :repeater, :pointer, 'anchor'], :handle_s_r_p_a)],
                   
+       # 3rd week in march
        :narrow => [Handler.new([:ordinal, :repeater, :separator_in, :repeater], :handle_o_r_s_r),
                    Handler.new([:ordinal, :repeater, :grabber, :repeater], :handle_o_r_g_r)]
       }
@@ -34,6 +39,7 @@ module Chronic
       
       self.definitions[:date].each do |handler|
         if handler.match(tokens, self.definitions)
+          puts "-date" if Chronic.debug
           good_tokens = tokens.select { |o| !o.get_tag Separator }
           return self.send(handler.handler_method, good_tokens, options)
         end
@@ -43,6 +49,7 @@ module Chronic
             
       self.definitions[:anchor].each do |handler|
         if handler.match(tokens, self.definitions)
+          puts "-anchor" if Chronic.debug
           good_tokens = tokens.select { |o| !o.get_tag Separator }
           return self.send(handler.handler_method, good_tokens, options)
         end
@@ -52,21 +59,24 @@ module Chronic
       
       self.definitions[:arrow].each do |handler|
         if handler.match(tokens, self.definitions)
+          puts "-arrow" if Chronic.debug
           good_tokens = tokens.reject { |o| o.get_tag(SeparatorAt) || o.get_tag(SeparatorSlashOrDash) || o.get_tag(SeparatorComma) }
           return self.send(handler.handler_method, good_tokens, options)
         end
       end
       
-      # not an arrow, let's hope it's an narrow
+      # not an arrow, let's hope it's a narrow
       
       self.definitions[:narrow].each do |handler|
         if handler.match(tokens, self.definitions)
+          puts "-narrow" if Chronic.debug
           #good_tokens = tokens.select { |o| !o.get_tag Separator }
           return self.send(handler.handler_method, tokens, options)
         end
       end
       
       # I guess you're out of luck!
+      puts "-none" if Chronic.debug
       return nil
     end
     
@@ -122,6 +132,19 @@ module Chronic
       end
     end
     
+    def handle_rdn_rmn_sd_t_tz_sy(tokens, options) #:nodoc:
+      month = tokens[1].get_tag(RepeaterMonthName).index
+      day = tokens[2].get_tag(ScalarDay).type
+      year = tokens[5].get_tag(ScalarYear).type
+      
+      begin
+        day_start = Time.local(year, month, day)
+        day_or_time(day_start, [tokens[3]], options)
+      rescue ArgumentError
+        nil
+      end
+    end
+    
     def handle_rmn_sd_sy(tokens, options) #:nodoc:
       month = tokens[0].get_tag(RepeaterMonthName).index
       day = tokens[1].get_tag(ScalarDay).type
@@ -333,22 +356,54 @@ module Chronic
     
     def dealias_and_disambiguate_times(tokens, options) #:nodoc:
       # handle aliases of am/pm
-      # 5:00 in the morning => 5:00 am
-      # 7:00 in the evening => 7:00 pm
-      #ttokens = []
-      tokens.each_with_index do |t0, i|
-        t1 = tokens[i + 1]
-        if t1 && (t1tag = t1.get_tag(RepeaterDayPortion)) && t0.get_tag(RepeaterTime)
-          if [:morning].include?(t1tag.type)
-            t1.untag(RepeaterDayPortion)
-            t1.tag(RepeaterDayPortion.new(:am))
-          elsif [:afternoon, :evening, :night].include?(t1tag.type)
-            t1.untag(RepeaterDayPortion)
-            t1.tag(RepeaterDayPortion.new(:pm))
-          end
+      # 5:00 in the morning -> 5:00 am
+      # 7:00 in the evening -> 7:00 pm
+      
+      day_portion_index = nil
+      tokens.each_with_index do |t, i|
+        if t.get_tag(RepeaterDayPortion)
+          day_portion_index = i
+          break
+        end
+      end
+       
+      time_index = nil
+      tokens.each_with_index do |t, i|
+        if t.get_tag(RepeaterTime)
+          time_index = i
+          break
+        end
+      end
+      
+      if (day_portion_index && time_index)
+        t1 = tokens[day_portion_index]
+        t1tag = t1.get_tag(RepeaterDayPortion)
+      
+        if [:morning].include?(t1tag.type)
+          puts '--morning->am' if Chronic.debug
+          t1.untag(RepeaterDayPortion)
+          t1.tag(RepeaterDayPortion.new(:am))
+        elsif [:afternoon, :evening, :night].include?(t1tag.type)
+          puts "--#{t1tag.type}->pm" if Chronic.debug
+          t1.untag(RepeaterDayPortion)
+          t1.tag(RepeaterDayPortion.new(:pm))
         end
       end
-      #tokens = ttokens
+      
+      # tokens.each_with_index do |t0, i|
+      #   t1 = tokens[i + 1]
+      #   if t1 && (t1tag = t1.get_tag(RepeaterDayPortion)) && t0.get_tag(RepeaterTime)
+      #     if [:morning].include?(t1tag.type)
+      #       puts '--morning->am' if Chronic.debug
+      #       t1.untag(RepeaterDayPortion)
+      #       t1.tag(RepeaterDayPortion.new(:am))
+      #     elsif [:afternoon, :evening, :night].include?(t1tag.type)
+      #       puts "--#{t1tag.type}->pm" if Chronic.debug
+      #       t1.untag(RepeaterDayPortion)
+      #       t1.tag(RepeaterDayPortion.new(:pm))
+      #     end
+      #   end
+      # end
             
       # handle ambiguous times if :ambiguous_time_range is specified
       if options[:ambiguous_time_range] != :none

data/lib/chronic/repeater.rb

@@ -33,6 +33,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   def self.scan_for_day_names(token)
     scanner = {/^m[ou]n(day)?$/ => :monday,
                /^t(ue|eu|oo|u|)s(day)?$/ => :tuesday,
+               /^tue$/ => :tuesday,
                /^we(dnes|nds|nns)day$/ => :wednesday,
                /^wed$/ => :wednesday,
                /^th(urs|ers)day$/ => :thursday,

data/lib/chronic/repeaters/repeater_day.rb

@@ -19,14 +19,14 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      day_begin = Time.local(@now.year, @now.month, @now.day, @now.hour + 1)
-      day_end = Time.local(@now.year, @now.month, @now.day) + DAY_SECONDS
+      day_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
+      day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
     when :past
-      day_begin = Time.local(@now.year, @now.month, @now.day)
-      day_end = Time.local(@now.year, @now.month, @now.day, @now.hour)
+      day_begin = Time.construct(@now.year, @now.month, @now.day)
+      day_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
     when :none
-      day_begin = Time.local(@now.year, @now.month, @now.day)
-      day_end = Time.local(@now.year, @now.month, @now.day) + DAY_SECONDS
+      day_begin = Time.construct(@now.year, @now.month, @now.day)
+      day_end = Time.construct(@now.year, @now.month, @now.day) + DAY_SECONDS
     end
     
     Chronic::Span.new(day_begin, day_end)

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -7,7 +7,7 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
     direction = pointer == :future ? 1 : -1
     
     if !@current_day_start
-      @current_day_start = Time.local(@now.year, @now.month, @now.day)
+      @current_day_start = Time.construct(@now.year, @now.month, @now.day)
       @current_day_start += direction * DAY_SECONDS
 
       day_num = symbol_to_number(@type)
@@ -34,7 +34,7 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   end
   
   def to_s
-    super << '-dayofweek-' << @type.to_s
+    super << '-dayname-' << @type.to_s
   end
   
   private

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,
@@ -28,27 +28,27 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
     full_day = 60 * 60 * 24
     
     if !@current_span
-      now_seconds = @now - Time.local(@now.year, @now.month, @now.day)
+      now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
       if now_seconds < @range.begin
         case pointer
         when :future
-          range_start = Time.local(@now.year, @now.month, @now.day) + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
         when :past
-          range_start = Time.local(@now.year, @now.month, @now.day) - full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
         end
       elsif now_seconds > @range.end
         case pointer
         when :future
-          range_start = Time.local(@now.year, @now.month, @now.day) + full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
         when :past
-          range_start = Time.local(@now.year, @now.month, @now.day) + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
         end
       else
         case pointer
         when :future
-          range_start = Time.local(@now.year, @now.month, @now.day) + full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
         when :past
-          range_start = Time.local(@now.year, @now.month, @now.day) - full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
         end
       end
       
@@ -66,7 +66,7 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
   def this(context = :future)
     super
     
-    range_start = Time.local(@now.year, @now.month, @now.day) + @range.begin
+    range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
     @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
   end
   

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -33,7 +33,7 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      this_fortnight_start = Time.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
+      this_fortnight_start = Time.construct(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
       sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
       sunday_repeater.start = @now
       sunday_repeater.this(:future)
@@ -41,7 +41,7 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
       this_fortnight_end = this_sunday_span.begin
       Chronic::Span.new(this_fortnight_start, this_fortnight_end)
     when :past
-      this_fortnight_end = Time.local(@now.year, @now.month, @now.day, @now.hour)
+      this_fortnight_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
       sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
       sunday_repeater.start = @now
       last_sunday_span = sunday_repeater.next(:past)

data/lib/chronic/repeaters/repeater_hour.rb

@@ -7,9 +7,9 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
     if !@current_hour_start
       case pointer
       when :future
-        @current_hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour + 1)
+        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
       when :past
-        @current_hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour - 1)
+        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour - 1)
       end
     else
       direction = pointer == :future ? 1 : -1
@@ -27,10 +27,10 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
       hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
       hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
     when :past
-      hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour)
-      hour_end = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
     when :none
-      hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour)
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
       hour_end = hour_begin + HOUR_SECONDS
     end
     

data/lib/chronic/repeaters/repeater_minute.rb

@@ -4,9 +4,19 @@ class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
   def next(pointer = :future)
     super
     
-    direction = pointer == :future ? 1 : -1
+    if !@current_minute_start
+      case pointer
+      when :future
+        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+      when :past
+        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min - 1)
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_minute_start += direction * MINUTE_SECONDS
+    end
     
-    raise 'not implemented'
+    Chronic::Span.new(@current_minute_start, @current_minute_start + MINUTE_SECONDS)
   end
   
   def this(pointer = :future)
@@ -15,13 +25,13 @@ class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
     case pointer
     when :future
       minute_begin = @now
-      minute_end = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
     when :past
-      minute_begin = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
       minute_end = @now
     when :none
-      minute_begin = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
-      minute_end = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
+      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
     end
     
     Chronic::Span.new(minute_begin, minute_end)

data/lib/chronic/repeaters/repeater_month.rb

@@ -6,12 +6,12 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
     super
     
     if !@current_month_start
-      @current_month_start = offset_by(Time.local(@now.year, @now.month), 1, pointer)
+      @current_month_start = offset_by(Time.construct(@now.year, @now.month), 1, pointer)
     else
-      @current_month_start = offset_by(Time.local(@current_month_start.year, @current_month_start.month), 1, pointer)
+      @current_month_start = offset_by(Time.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
     end
     
-    Chronic::Span.new(@current_month_start, Time.local(@current_month_start.year, @current_month_start.month + 1))
+    Chronic::Span.new(@current_month_start, Time.construct(@current_month_start.year, @current_month_start.month + 1))
   end
   
   def this(pointer = :future)
@@ -19,14 +19,14 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      month_start = Time.local(@now.year, @now.month, @now.day + 1)
-      month_end = self.offset_by(Time.local(@now.year, @now.month), 1, :future)
+      month_start = Time.construct(@now.year, @now.month, @now.day + 1)
+      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
     when :past
-      month_start = Time.local(@now.year, @now.month)
-      month_end = Time.local(@now.year, @now.month, @now.day)
+      month_start = Time.construct(@now.year, @now.month)
+      month_end = Time.construct(@now.year, @now.month, @now.day)
     when :none
-      month_start = Time.local(@now.year, @now.month)
-      month_end = self.offset_by(Time.local(@now.year, @now.month), 1, :future)
+      month_start = Time.construct(@now.year, @now.month)
+      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
     end
     
     Chronic::Span.new(month_start, month_end)
@@ -48,10 +48,14 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
       new_year += 1
       new_month -= YEAR_MONTHS
     end
-    Time.local(new_year, new_month, time.day, time.hour, time.min, time.sec)
+    Time.construct(new_year, new_month, time.day, time.hour, time.min, time.sec)
   end
   
   def width
     MONTH_SECONDS
   end
+  
+  def to_s
+    super << '-month'
+  end
 end

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -9,30 +9,30 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
       case pointer
       when :future
         if @now.month < target_month
-          @current_month_begin = Time.local(@now.year, target_month)
+          @current_month_begin = Time.construct(@now.year, target_month)
         else @now.month > target_month
-          @current_month_begin = Time.local(@now.year + 1, target_month)
+          @current_month_begin = Time.construct(@now.year + 1, target_month)
         end
       when :none
         if @now.month <= target_month
-          @current_month_begin = Time.local(@now.year, target_month)
+          @current_month_begin = Time.construct(@now.year, target_month)
         else @now.month > target_month
-          @current_month_begin = Time.local(@now.year + 1, target_month)
+          @current_month_begin = Time.construct(@now.year + 1, target_month)
         end
       when :past
         if @now.month > target_month
-          @current_month_begin = Time.local(@now.year, target_month)
+          @current_month_begin = Time.construct(@now.year, target_month)
         else @now.month < target_month
-          @current_month_begin = Time.local(@now.year - 1, target_month)
+          @current_month_begin = Time.construct(@now.year - 1, target_month)
         end
       end
       @current_month_begin || raise("Current month should be set by now")
     else
       case pointer
       when :future
-        @current_month_begin = Time.local(@current_month_begin.year + 1, @current_month_begin.month)
+        @current_month_begin = Time.construct(@current_month_begin.year + 1, @current_month_begin.month)
       when :past
-        @current_month_begin = Time.local(@current_month_begin.year - 1, @current_month_begin.month)
+        @current_month_begin = Time.construct(@current_month_begin.year - 1, @current_month_begin.month)
       end
     end
     
@@ -47,7 +47,7 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
       next_month_month = cur_month_month + 1
     end
       
-    Chronic::Span.new(@current_month_begin, Time.local(next_month_year, next_month_month))
+    Chronic::Span.new(@current_month_begin, Time.construct(next_month_year, next_month_month))
   end
   
   def this(pointer = :future)
@@ -70,7 +70,7 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
   end
   
   def to_s
-    super << '-month-' << @type.to_s
+    super << '-monthname-' << @type.to_s
   end
   
   private

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/lib/chronic/repeaters/repeater_year.rb

@@ -6,16 +6,16 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     if !@current_year_start
       case pointer
       when :future
-        @current_year_start = Time.local(@now.year + 1)
+        @current_year_start = Time.construct(@now.year + 1)
       when :past
-        @current_year_start = Time.local(@now.year - 1)
+        @current_year_start = Time.construct(@now.year - 1)
       end
     else
       diff = pointer == :future ? 1 : -1
-      @current_year_start = Time.local(@current_year_start.year + diff)
+      @current_year_start = Time.construct(@current_year_start.year + diff)
     end
     
-    Chronic::Span.new(@current_year_start, Time.local(@current_year_start.year + 1))
+    Chronic::Span.new(@current_year_start, Time.construct(@current_year_start.year + 1))
   end
   
   def this(pointer = :future)
@@ -23,14 +23,14 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      this_year_start = Time.local(@now.year, @now.month, @now.day) + Chronic::RepeaterDay::DAY_SECONDS
-      this_year_end = Time.local(@now.year + 1, 1, 1)
+      this_year_start = Time.construct(@now.year, @now.month, @now.day) + Chronic::RepeaterDay::DAY_SECONDS
+      this_year_end = Time.construct(@now.year + 1, 1, 1)
     when :past
-      this_year_start = Time.local(@now.year, 1, 1)
-      this_year_end = Time.local(@now.year, @now.month, @now.day)
+      this_year_start = Time.construct(@now.year, 1, 1)
+      this_year_end = Time.construct(@now.year, @now.month, @now.day)
     when :none
-      this_year_start = Time.local(@now.year, 1, 1)
-      this_year_end = Time.local(@now.year + 1, 1, 1)
+      this_year_start = Time.construct(@now.year, 1, 1)
+      this_year_end = Time.construct(@now.year + 1, 1, 1)
     end
     
     Chronic::Span.new(this_year_start, this_year_end)
@@ -40,10 +40,10 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     direction = pointer == :future ? 1 : -1
     
     sb = span.begin
-    new_begin = Time.local(sb.year + (amount * direction), sb.month, sb.day, sb.hour, sb.min, sb.sec)
+    new_begin = Time.construct(sb.year + (amount * direction), sb.month, sb.day, sb.hour, sb.min, sb.sec)
     
     se = span.end
-    new_end = Time.local(se.year + (amount * direction), se.month, se.day, se.hour, se.min, se.sec)
+    new_end = Time.construct(se.year + (amount * direction), se.month, se.day, se.hour, se.min, se.sec)
     
     Chronic::Span.new(new_begin, new_end)
   end

data/lib/chronic/time_zone.rb

@@ -0,0 +1,22 @@
+module Chronic
+  class TimeZone < Tag #:nodoc:    
+    def self.scan(tokens)
+      tokens.each_index do |i|
+        if t = self.scan_for_all(tokens[i]) then tokens[i].tag(t); next end
+      end
+      tokens
+    end
+
+    def self.scan_for_all(token)
+      scanner = {/[PMCE][DS]T/i => :tz}
+      scanner.keys.each do |scanner_item|
+        return self.new(scanner[scanner_item]) if scanner_item =~ token.word
+      end
+      return nil
+    end
+
+    def to_s
+      'timezone'
+    end
+  end
+end

data/lib/chronic.rb

@@ -34,11 +34,12 @@ require 'chronic/pointer'
 require 'chronic/scalar'
 require 'chronic/ordinal'
 require 'chronic/separator'
+require 'chronic/time_zone'
 
 require 'numerizer/numerizer'
 
 module Chronic
-  VERSION = "0.2.0"
+  VERSION = "0.2.3"
   
   def self.debug; false; end
 end
@@ -50,6 +51,33 @@ def p(val)
   puts
 end
 
+# class Time
+#   def self.construct(year, month = 1, day = 1, hour = 0, minute = 0, second = 0)
+#     # extra_seconds = second > 60 ? second - 60 : 0
+#     # extra_minutes = minute > 59 ? minute - 59 : 0
+#     # extra_hours = hour > 23 ? hour - 23 : 0
+#     # extra_days = day > 
+#     
+#     if month > 12
+#       if month % 12 == 0
+#         year += (month - 12) / 12
+#         month = 12
+#       else
+#         year += month / 12
+#         month = month % 12
+#       end
+#     end
+#     
+#     base = Time.local(year, month)
+#     puts base
+#     offset = ((day - 1) * 24 * 60 * 60) + (hour * 60 * 60) + (minute * 60) + second
+#     puts offset.to_s
+#     date = base + offset
+#     puts date
+#     date
+#   end
+# end
+
 class Time
   def self.construct(year, month = 1, day = 1, hour = 0, minute = 0, second = 0)
     if second >= 60
@@ -67,6 +95,31 @@ class Time
       hour = hour % 24
     end
     
+    # determine if there is a day overflow. this is complicated by our crappy calendar
+    # system (non-constant number of days per month)
+    day <= 56 || raise("day must be no more than 56 (makes month resolution easier)")
+    if day > 28
+      # no month ever has fewer than 28 days, so only do this if necessary
+      leap_year = (year % 4 == 0) && !(year % 100 == 0)
+      leap_year_month_days = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+      common_year_month_days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+      days_this_month = leap_year ? leap_year_month_days[month - 1] : common_year_month_days[month - 1]
+      if day > days_this_month
+        month += day / days_this_month
+        day = day % days_this_month
+      end
+    end
+    
+    if month > 12
+      if month % 12 == 0
+        year += (month - 12) / 12
+        month = 12
+      else
+        year += month / 12
+        month = month % 12
+      end
+    end
+    
     Time.local(year, month, day, hour, minute, second)
   end
 end

data/test/test_Time.rb

@@ -0,0 +1,50 @@
+require 'chronic'
+require 'test/unit'
+
+class TestTime < Test::Unit::TestCase
+  
+  def setup
+  end
+  
+  def test_normal
+    assert_equal Time.local(2006, 1, 2, 0, 0, 0), Time.construct(2006, 1, 2, 0, 0, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 0, 0), Time.construct(2006, 1, 2, 3, 0, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 4, 0), Time.construct(2006, 1, 2, 3, 4, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 4, 5), Time.construct(2006, 1, 2, 3, 4, 5)
+  end
+  
+  def test_second_overflow
+    assert_equal Time.local(2006, 1, 1, 0, 1, 30), Time.construct(2006, 1, 1, 0, 0, 90)
+    assert_equal Time.local(2006, 1, 1, 0, 5, 0), Time.construct(2006, 1, 1, 0, 0, 300)
+  end
+  
+  def test_minute_overflow
+    assert_equal Time.local(2006, 1, 1, 1, 30), Time.construct(2006, 1, 1, 0, 90)
+    assert_equal Time.local(2006, 1, 1, 5), Time.construct(2006, 1, 1, 0, 300)
+  end
+  
+  def test_hour_overflow
+    assert_equal Time.local(2006, 1, 2, 12), Time.construct(2006, 1, 1, 36)
+    assert_equal Time.local(2006, 1, 7), Time.construct(2006, 1, 1, 144)
+  end
+  
+  def test_day_overflow
+    assert_equal Time.local(2006, 2, 1), Time.construct(2006, 1, 32)
+    assert_equal Time.local(2006, 3, 5), Time.construct(2006, 2, 33)
+    assert_equal Time.local(2004, 3, 4), Time.construct(2004, 2, 33)
+    assert_equal Time.local(2000, 3, 5), Time.construct(2000, 2, 33)
+    
+    assert_nothing_raised do
+      Time.construct(2006, 1, 56)
+    end
+    
+    assert_raise(RuntimeError) do
+      Time.construct(2006, 1, 57)
+    end
+  end
+  
+  def test_month_overflow
+    assert_equal Time.local(2006, 1), Time.construct(2005, 13)
+    assert_equal Time.local(2005, 12), Time.construct(2000, 72)
+  end
+end

data/test/test_parsing.rb

@@ -1,4 +1,5 @@
 require 'chronic'
+require 'time'
 require 'test/unit'
 
 class TestParsing < Test::Unit::TestCase
@@ -136,6 +137,15 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("2006-08-20 15:30.30")
     assert_equal Time.local(2006, 8, 20, 15, 30, 30), time
     
+    # rdn_rm_rd_rt_rtz_ry
+    
+    time = parse_now("Mon Apr 02 17:00:00 PDT 2007")
+    assert_equal Time.local(2007, 4, 2, 17), time
+    
+    now = Time.now
+    time = parse_now(now.to_s)
+    assert_equal now.to_s, time.to_s
+    
     # rm_sd_rt
     
     #time = parse_now("jan 5 13:00")
@@ -152,11 +162,18 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("1800-08-20")
     assert_equal nil, time
   end
+  
+  def test_foo
+    Chronic.parse('two months ago this friday')
+  end
 
   def test_parse_guess_r
     time = parse_now("friday")
     assert_equal Time.local(2006, 8, 18, 12), time
     
+    time = parse_now("tue")
+    assert_equal Time.local(2006, 8, 22, 12), time
+    
     time = parse_now("5")
     assert_equal Time.local(2006, 8, 16, 17), time
     
@@ -192,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
     
@@ -214,6 +243,9 @@ class TestParsing < Test::Unit::TestCase
     
     time = parse_now("sunday 6am")
     assert_equal Time.local(2006, 8, 20, 6), time
+    
+    time = parse_now("friday evening at 7")
+    assert_equal Time.local(2006, 8, 18, 19), time
   end
   
   def test_parse_guess_gr
@@ -233,6 +265,9 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("this month", :context => :past)
     assert_equal Time.local(2006, 8, 8, 12), time
     
+    time = Chronic.parse("next month", :now => Time.local(2006, 11, 15))
+    assert_equal Time.local(2006, 12, 16, 12), time
+    
     # month name
     
     time = parse_now("last november")
@@ -310,6 +345,11 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("tonight")
     assert_equal Time.local(2006, 8, 16, 22), time
     
+    # minute
+    
+    time = parse_now("next minute")
+    assert_equal Time.local(2006, 8, 16, 14, 1, 30), time
+    
     # second
     
     time = parse_now("this second")
@@ -355,8 +395,17 @@ class TestParsing < Test::Unit::TestCase
     
     time = parse_now("last week tuesday")
     assert_equal Time.local(2006, 8, 8, 12), time
+    
+    time = parse_now("tonight at 7")
+    assert_equal Time.local(2006, 8, 16, 19), time
+    
+    time = parse_now("tonight 7")
+    assert_equal Time.local(2006, 8, 16, 19), time
+    
+    time = parse_now("7 tonight")
+    assert_equal Time.local(2006, 8, 16, 19), time
   end
-  
+    
   def test_parse_guess_grrr
     time = parse_now("today at 6:00pm")
     assert_equal Time.local(2006, 8, 16, 18), time
@@ -369,6 +418,18 @@ class TestParsing < Test::Unit::TestCase
     
     time = parse_now("yesterday at 4:00pm")
     assert_equal Time.local(2006, 8, 15, 16), time
+    
+    time = parse_now("tomorrow evening at 7")
+    assert_equal Time.local(2006, 8, 17, 19), time
+    
+    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
@@ -489,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,12 +3,12 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: chronic
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-03-20 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
-email: ryand-ruby@zenspider.com
+email: tom@rubyisawesome.com
 homepage: "\thttp://chronic.rubyforge.org/"
 rubyforge_project: chronic
 description: Chronic is a natural language date/time parser written in pure Ruby. See below for the wide variety of formats Chronic will parse.
@@ -27,7 +27,7 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Ryan Davis
+- Tom Preston-Werner
 files: 
 - History.txt
 - Manifest.txt
@@ -57,6 +57,7 @@ files:
 - lib/chronic/repeaters/repeater_year.rb
 - lib/chronic/scalar.rb
 - lib/chronic/separator.rb
+- lib/chronic/time_zone.rb
 - lib/numerizer/numerizer.rb
 - test/suite.rb
 - test/test_Chronic.rb
@@ -72,6 +73,7 @@ files:
 - test/test_RepeaterWeekend.rb
 - test/test_RepeaterYear.rb
 - test/test_Span.rb
+- test/test_Time.rb
 - test/test_Token.rb
 - test/test_parsing.rb
 test_files: 
@@ -89,11 +91,15 @@ test_files:
 - test/test_RepeaterWeekend.rb
 - test/test_RepeaterYear.rb
 - 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: []
@@ -108,5 +114,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: