chronic 0.1.0 → 0.2.2

data/History.txt

@@ -0,0 +1,49 @@
+= 0.2.2
+
+* added missing files (damn you manifest!)
+
+= 0.2.1
+
+* fixed time overflow issue
+* 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 (by eventualbuddha)
+
+= 0.1.5 2006-12-20
+
+* fixed 'aug 20' returning next year if current month is august
+* modified behavior of 'from now'
+* added support for seconds on times, and thus db timestamp format: "2006-12-20 18:04:23"
+* made Hoe compliant
+
+= 0.1.4
+
+* removed verbose error checking code. oops. :-/
+
+= 0.1.3
+
+* 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
+
+* removed Date dependency (now works on windows properly without fiddling)
+
+= 0.1.1
+
+* run to_s on incoming object
+* fixed loop loading of repeaters files (out of order on some machines)
+* fixed find_within to use this instead of next (was breaking "today at 6pm")
+
+= 0.1.0
+
+* initial release

data/Manifest.txt

@@ -0,0 +1,47 @@
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+lib/chronic.rb
+lib/chronic/chronic.rb
+lib/chronic/grabber.rb
+lib/chronic/handlers.rb
+lib/chronic/ordinal.rb
+lib/chronic/pointer.rb
+lib/chronic/repeater.rb
+lib/chronic/repeaters/repeater_day.rb
+lib/chronic/repeaters/repeater_day_name.rb
+lib/chronic/repeaters/repeater_day_portion.rb
+lib/chronic/repeaters/repeater_fortnight.rb
+lib/chronic/repeaters/repeater_hour.rb
+lib/chronic/repeaters/repeater_minute.rb
+lib/chronic/repeaters/repeater_month.rb
+lib/chronic/repeaters/repeater_month_name.rb
+lib/chronic/repeaters/repeater_season.rb
+lib/chronic/repeaters/repeater_season_name.rb
+lib/chronic/repeaters/repeater_second.rb
+lib/chronic/repeaters/repeater_time.rb
+lib/chronic/repeaters/repeater_week.rb
+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
+test/test_Handler.rb
+test/test_Numerizer.rb
+test/test_RepeaterDayName.rb
+test/test_RepeaterFortnight.rb
+test/test_RepeaterHour.rb
+test/test_RepeaterMonth.rb
+test/test_RepeaterMonthName.rb
+test/test_RepeaterTime.rb
+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/{README → README.txt}

@@ -1,17 +1,22 @@
-=Chronic
+Chronic
+	http://chronic.rubyforge.org/
+	by Tom Preston-Werner
+
+== DESCRIPTION:
 
 Chronic is a natural language date/time parser written in pure Ruby. See below for the wide variety of formats Chronic will parse.
 
-==Installation
+== INSTALLATION:
 
 Chronic can be installed via RubyGems:
 
   $ sudo gem install chronic
 
-==Usage
+== USAGE:
 
 You can parse strings containing a natural language date using the Chronic.parse method.
 
+  require 'rubygems'
   require 'chronic'
 
   Time.now   #=> Sun Aug 27 23:18:25 PDT 2006
@@ -38,7 +43,7 @@ You can parse strings containing a natural language date using the Chronic.parse
 
 See Chronic.parse for detailed usage instructions.
 
-==Examples
+== EXAMPLES:
 
 Chronic can parse a huge variety of date and time formats. Following is a small sample of strings that will be properly parsed. Parsing is case insensitive and will handle common abbreviations and misspellings.
 
@@ -109,11 +114,36 @@ Specific Dates
 Specific Times (many of the above with an added time)
 
   January 5 at 7pm
-  1979-05-27 05:00
+  1979-05-27 05:00:00
   etc
 
-==Limitations
+== LIMITATIONS:
   
 Chronic uses Ruby's built in Time class for all time storage and computation. Because of this, only times that the Time class can handle will be properly parsed. Parsing for times outside of this range will simply return nil. Support for a wider range of times is planned for a future release.
 
-Time zones other than the local one are not currently supported. Support for other time zones is planned for a future release.
+Time zones other than the local one are not currently supported. Support for other time zones is planned for a future release.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2006 Ryan Davis, Zen Spider Software
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,19 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+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")
+  p.need_tar = false
+  p.extra_deps = []
+end
+
+# vim: syntax=Ruby

data/lib/chronic/chronic.rb

@@ -50,7 +50,7 @@ module Chronic
       specified_options.keys.each do |key|
         default_options.keys.include?(key) || raise(InvalidArgumentException, "#{key} is not a valid option key.")
       end
-      [:past, :future].include?(options[:context]) || raise(InvalidArgumentException, "Invalid value '#{options[:context]}' for :context specified. Valid values are :past and :future.")
+      [:past, :future, :none].include?(options[:context]) || raise(InvalidArgumentException, "Invalid value ':#{options[:context]}' for :context specified. Valid values are :past and :future.")
       
       # store now for later =)
       @now = options[:now]
@@ -66,14 +66,14 @@ 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
       
       # strip any non-tagged tokens
       @tokens = @tokens.select { |token| token.tagged? }
       
-      if @debug
+      if Chronic.debug
         puts "+---------------------------------------------------"
         puts "| " + @tokens.to_s
         puts "+---------------------------------------------------"
@@ -100,7 +100,8 @@ module Chronic
     # to numbers (three => 3), and converting ordinal words to numeric
     # ordinals (third => 3rd)
     def pre_normalize(text) #:nodoc:
-      normalized_text = text.downcase
+      normalized_text = text.to_s.downcase
+      normalized_text = numericize_numbers(normalized_text)
       normalized_text.gsub!(/['"\.]/, '')
       normalized_text.gsub!(/([\/\-\,\@])/) { ' ' + $1 + ' ' }
       normalized_text.gsub!(/\btoday\b/, 'this day')
@@ -108,7 +109,6 @@ module Chronic
       normalized_text.gsub!(/\byesterday\b/, 'last day')
       normalized_text.gsub!(/\bnoon\b/, '12:00')
       normalized_text.gsub!(/\bmidnight\b/, '24:00')
-      normalized_text.gsub!(/\bfrom now\b/, 'future')
       normalized_text.gsub!(/\bbefore now\b/, 'past')
       normalized_text.gsub!(/\bnow\b/, 'this second')
       normalized_text.gsub!(/\b(ago|before)\b/, 'past')
@@ -119,15 +119,12 @@ module Chronic
       normalized_text.gsub!(/\btonight\b/, 'this night')
       normalized_text.gsub!(/(?=\w)([ap]m|oclock)\b/, ' \1')
       normalized_text.gsub!(/\b(hence|after|from)\b/, 'future')
-      normalized_text.gsub!(/\ba\b/, '1')
-      normalized_text.gsub!(/\s+/, ' ')
-      normalized_text = numericize_numbers(normalized_text)
       normalized_text = numericize_ordinals(normalized_text)
     end
   
     # Convert number words to numbers (three => 3)
     def numericize_numbers(text) #:nodoc:
-      text
+      Numerizer.numerize(text)
     end
   
     # Convert ordinal words to numeric ordinals (third => 3rd)

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
     
@@ -88,7 +98,7 @@ module Chronic
     
     def handle_m_d(month, day, time_tokens, options) #:nodoc:
       month.start = @now
-      span = month.next(options[:context])
+      span = month.this(options[:context])
       
       day_start = Time.local(span.begin.year, span.begin.month, day)
       
@@ -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
@@ -213,18 +236,20 @@ module Chronic
     
     def handle_s_r_p(tokens, options) #:nodoc:
       repeater = tokens[1].get_tag(Repeater)
+            
+      # span = 
+      # case true
+      # when [RepeaterYear, RepeaterSeason, RepeaterSeasonName, RepeaterMonth, RepeaterMonthName, RepeaterFortnight, RepeaterWeek].include?(repeater.class)
+      #   self.parse("this hour", :guess => false, :now => @now)
+      # when [RepeaterWeekend, RepeaterDay, RepeaterDayName, RepeaterDayPortion, RepeaterHour].include?(repeater.class)
+      #   self.parse("this minute", :guess => false, :now => @now)
+      # when [RepeaterMinute, RepeaterSecond].include?(repeater.class)
+      #   self.parse("this second", :guess => false, :now => @now)
+      # else
+      #   raise(ChronicPain, "Invalid repeater: #{repeater.class}")
+      # end
       
-      span = 
-      case true
-      when [RepeaterYear, RepeaterSeason, RepeaterSeasonName, RepeaterMonth, RepeaterMonthName, RepeaterFortnight, RepeaterWeek].include?(repeater.class)
-        self.parse("this hour", :guess => false, :now => @now)
-      when [RepeaterWeekend, RepeaterDay, RepeaterDayName, RepeaterDayPortion, RepeaterHour].include?(repeater.class)
-        self.parse("this minute", :guess => false, :now => @now)
-      when [RepeaterMinute, RepeaterSecond].include?(repeater.class)
-        self.parse("this second", :guess => false, :now => @now)
-      else
-        raise(ChronicPain, "Invalid repeater: #{repeater.class}")
-      end
+      span = self.parse("this second", :guess => false, :now => @now)
       
       self.handle_srp(tokens, span, options)
     end
@@ -274,32 +299,38 @@ module Chronic
       
       repeaters = self.get_repeaters(tokens)
       repeaters.size.times { tokens.pop }
-        
-      if tokens.last && tokens.last.get_tag(Grabber)
-        grabber = tokens.last.get_tag(Grabber)
+                    
+      if tokens.first && tokens.first.get_tag(Grabber)
+        grabber = tokens.first.get_tag(Grabber)
         tokens.pop
       end
       
       head = repeaters.shift
       head.start = @now
-      
+                  
       case grabber.type
-        when :last: outer_span = head.next(:past)
-        when :this: outer_span = head.this(options[:context])
-        when :next: outer_span = head.next(:future)
+        when :last
+          outer_span = head.next(:past)
+        when :this
+          if repeaters.size > 0
+            outer_span = head.this(:none)
+          else
+            outer_span = head.this(options[:context])
+          end
+        when :next
+          outer_span = head.next(:future)
         else raise(ChronicPain, "Invalid grabber")
       end
       
+      puts "--#{outer_span}" if Chronic.debug
       anchor = find_within(repeaters, outer_span, pointer)
     end
     
     def get_repeaters(tokens) #:nodoc:
       repeaters = []
-		  tokens.reverse.each do |token|
+		  tokens.each do |token|
 		    if t = token.get_tag(Repeater)
           repeaters << t
-        else
-          break
         end
       end
       repeaters.sort.reverse
@@ -309,12 +340,13 @@ module Chronic
     # Returns a Span representing the innermost time span
     # or nil if no repeater union could be found
     def find_within(tags, span, pointer) #:nodoc:
+      puts "--#{span}" if Chronic.debug
       return span if tags.empty?
       
       head, *rest = tags
       head.start = pointer == :future ? span.begin : span.end
-      h = head.next(pointer)
-      
+      h = head.this(:none)
+            
       if span.include?(h.begin) || span.include?(h.end)
         return find_within(rest, h, pointer)
       else
@@ -324,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
-      #tokens = ttokens
+       
+      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.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/pointer.rb

@@ -10,9 +10,9 @@ module Chronic
     end
   
     def self.scan_for_all(token)
-      scanner = {/past/ => :past,
-                 /future/ => :future,
-                 /in/ => :future}
+      scanner = {/\bpast\b/ => :past,
+                 /\bfuture\b/ => :future,
+                 /\bin\b/ => :future}
       scanner.keys.each do |scanner_item|
         return self.new(scanner[scanner_item]) if scanner_item =~ token.word
       end

data/lib/chronic/repeater.rb

@@ -6,7 +6,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
       if t = self.scan_for_day_names(tokens[i]) then tokens[i].tag(t); next end
       if t = self.scan_for_day_portions(tokens[i]) then tokens[i].tag(t); next end
       if t = self.scan_for_times(tokens[i], options) then tokens[i].tag(t); next end
-      if t = self.scan_for_units(tokens[i]) then tokens[i].tag(t); next end 
+      if t = self.scan_for_units(tokens[i]) then tokens[i].tag(t); next end
     end
     tokens
   end
@@ -20,7 +20,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^jun\.?e?$/ => :june,
                /^jul\.?y?$/ => :july,
                /^aug\.?(ust)?$/ => :august,
-               /^sep\.?(tember)?$/ => :september,
+               /^sep\.?(t\.?|tember)?$/ => :september,
                /^oct\.?(ober)?$/ => :october,
                /^nov\.?(ember)?$/ => :november,
                /^dec\.?(ember)?$/ => :december}
@@ -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,
@@ -52,7 +53,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^mornings?$/ => :morning,
                /^afternoons?$/ => :afternoon,
                /^evenings?$/ => :evening,
-               /^nights?$/ => :night}
+               /^(night|nite)s?$/ => :night}
     scanner.keys.each do |scanner_item|
       return Chronic::RepeaterDayPortion.new(scanner[scanner_item]) if scanner_item =~ token.word
     end
@@ -60,7 +61,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   end
   
   def self.scan_for_times(token, options)
-    if token.word =~ /^\d{1,2}(:?\d{2})?$/
+    if token.word =~ /^\d{1,2}(:?\d{2})?([\.:]?\d{2})?$/
       return Chronic::RepeaterTime.new(token.word, options)
     end
     return nil
@@ -72,7 +73,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^months?$/ => :month,
                /^fortnights?$/ => :fortnight,
                /^weeks?$/ => :week,
-               /^weekends?$/ => :weekends,
+               /^weekends?$/ => :weekend,
                /^days?$/ => :day,
                /^hours?$/ => :hour,
                /^minutes?$/ => :minute,
@@ -99,13 +100,13 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   # returns the next occurance of this repeatable.
   def next(pointer)
     !@now.nil? || raise("Start point must be set before calling #next")
-    [:future, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
+    [:future, :none, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
     #raise("Repeatable#next must be overridden in subclasses")
   end
   
   def this(pointer)
-    !@now.nil? || raise("Start point must be set before calling #next")
-    [:future, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
+    !@now.nil? || raise("Start point must be set before calling #this")
+    [:future, :past, :none].include?(pointer) || raise("First argument 'pointer' must be one of :past, :future, :none")
   end
   
   def to_s

data/lib/chronic/repeaters/repeater_day.rb

@@ -4,10 +4,14 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
   def next(pointer)
     super
     
-    @current_day ||= Date.parse(@now.to_s)
-    @current_day += pointer == :future ? 1 : -1
-    span_begin = Time.parse(@current_day.to_s)
-    Chronic::Span.new(span_begin, span_begin + width)
+    if !@current_day_start
+      @current_day_start = Time.local(@now.year, @now.month, @now.day)
+    end
+    
+    direction = pointer == :future ? 1 : -1
+    @current_day_start += direction * DAY_SECONDS
+    
+    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
   
   def this(pointer = :future)
@@ -15,11 +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.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)