@@ -46,9 +46,11 @@ module Chronic class << self attr_accessor :debug + attr_accessor :time_class end - + self.debug = false + self.time_class = Time end alias p_orig p @@ -127,6 +129,6 @@ class Time end end - Time.local(year, month, day, hour, minute, second) + Chronic.time_class.local(year, month, day, hour, minute, second) end end \ No newline at end of file lib/chronic.rb @@ -43,7 +43,7 @@ module Chronic # get options and set defaults if necessary default_options = {:context => :future, - :now => Time.now, + :now => Chronic.time_class.now, :guess => true, :ambiguous_time_range => 6, :endian_precedence => nil} @@ -51,7 +51,7 @@ module Chronic # handle options that were set to nil options[:context] = :future unless options[:context] - options[:now] = Time.now unless options[:context] + options[:now] = Chronic.time_class.now unless options[:context] options[:ambiguous_time_range] = 6 unless options[:ambiguous_time_range] # ensure the specified options are valid lib/chronic/chronic.rb @@ -143,7 +143,7 @@ module Chronic month.start = @now span = month.this(options[:context]) - day_start = Time.local(span.begin.year, span.begin.month, day) + day_start = Chronic.time_class.local(span.begin.year, span.begin.month, day) day_or_time(day_start, time_tokens, options) end @@ -185,14 +185,14 @@ module Chronic end begin - Span.new(Time.local(year, month), Time.local(next_month_year, next_month_month)) + Span.new(Chronic.time_class.local(year, month), Chronic.time_class.local(next_month_year, next_month_month)) rescue ArgumentError nil end end def handle_rdn_rmn_sd_t_tz_sy(tokens, options) #:nodoc: - t = Time.parse(@text) + t = Chronic.time_class.parse(@text) Span.new(t, t + 1) end @@ -204,7 +204,7 @@ module Chronic time_tokens = tokens.last(tokens.size - 3) begin - day_start = Time.local(year, month, day) + day_start = Chronic.time_class.local(year, month, day) day_or_time(day_start, time_tokens, options) rescue ArgumentError nil @@ -225,7 +225,7 @@ module Chronic time_tokens = tokens.last(tokens.size - 3) begin - day_start = Time.local(year, month, day) #:nodoc: + day_start = Chronic.time_class.local(year, month, day) #:nodoc: day_or_time(day_start, time_tokens, options) rescue ArgumentError nil @@ -257,7 +257,7 @@ module Chronic end begin - Span.new(Time.local(year, month), Time.local(next_month_year, next_month_month)) + Span.new(Chronic.time_class.local(year, month), Chronic.time_class.local(next_month_year, next_month_month)) rescue ArgumentError nil end lib/chronic/handlers.rb @@ -10,7 +10,7 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc: super if !@current_day_start - @current_day_start = Time.local(@now.year, @now.month, @now.day) + @current_day_start = Chronic.time_class.local(@now.year, @now.month, @now.day) end direction = pointer == :future ? 1 : -1 lib/chronic/repeaters/repeater_day.rb @@ -63,7 +63,7 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc: unless @current_time first = true - midnight = Time.local(@now.year, @now.month, @now.day) + midnight = Chronic.time_class.local(@now.year, @now.month, @now.day) yesterday_midnight = midnight - full_day tomorrow_midnight = midnight + full_day lib/chronic/repeaters/repeater_time.rb @@ -36,14 +36,14 @@ class Chronic::RepeaterWeek < Chronic::Repeater #:nodoc: case pointer when :future - this_week_start = Time.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS + this_week_start = Chronic.time_class.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS sunday_repeater = Chronic::RepeaterDayName.new(:sunday) sunday_repeater.start = @now this_sunday_span = sunday_repeater.this(:future) this_week_end = this_sunday_span.begin Chronic::Span.new(this_week_start, this_week_end) when :past - this_week_end = Time.local(@now.year, @now.month, @now.day, @now.hour) + this_week_end = Chronic.time_class.local(@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) lib/chronic/repeaters/repeater_week.rb f3beeba246b1f0010f5822cfc9fac27fbf7ba78a rick technoweenie@gmail.com http://github.com/technoweenie/chronic/commit/9979458a4c4e8010d3c3c84b616a28f128bc7f82 9979458a4c4e8010d3c3c84b616a28f128bc7f82 2008-03-22T17:06:06-07:00 2008-03-22T17:06:06-07:00 Add Chronic.time_class option. Set it to Time.zone (ActiveSupport::TimeWithZone) for timezone goodness 73f26572cb1f3086f4728b31aae4a465d906200f rick technoweenie@gmail.com