chronic 0.1.6 → 0.2.3

data/History.txt

@@ -1,6 +1,26 @@
+= 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 "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
 
@@ -15,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,10 +26,12 @@ lib/chronic/repeaters/repeater_weekend.rb
 lib/chronic/repeaters/repeater_year.rb
 lib/chronic/scalar.rb
 lib/chronic/separator.rb
-test/parse_numbers.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
@@ -37,7 +39,9 @@ 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/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
       
@@ -101,6 +101,7 @@ module Chronic
     # ordinals (third => 3rd)
     def pre_normalize(text) #:nodoc:
       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')
@@ -118,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
     
@@ -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
@@ -214,17 +237,19 @@ 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
@@ -331,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
-      #tokens = ttokens
+      
+      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

@@ -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
@@ -24,13 +24,13 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
-      hour_end = Time.local(@now.year, @now.month, @now.day, @now.hour + 1)
+      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