Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Time.zone.parse: compatibility with far future date with time zone of…

…fset in string. Eliminate creation of additional TimeWithZone instance to determine utc offset.
  • Loading branch information...
commit fb9bf16e96e2c24d4996327500d8109b5d535e2c 1 parent 328fada
@gbuesing gbuesing authored
View
7 activesupport/lib/active_support/values/time_zone.rb
@@ -214,10 +214,11 @@ def at(secs)
# Time.zone.parse('22:30:00') # => Fri, 31 Dec 1999 22:30:00 HST -10:00
def parse(str, now=now)
time = Time.parse(str, now) rescue DateTime.parse(str)
- unless time.is_a?(DateTime) || Date._parse(str)[:offset].nil?
- time += time.in_time_zone(self).utc_offset - time.utc_offset
+ if Date._parse(str)[:offset].nil?
+ ActiveSupport::TimeWithZone.new(nil, self, time)
+ else
+ time.in_time_zone(self)
end
- ActiveSupport::TimeWithZone.new(nil, self, time)
end
# Returns an ActiveSupport::TimeWithZone instance representing the current time
View
9 activesupport/test/time_zone_test.rb
@@ -189,6 +189,15 @@ def test_parse_with_old_date
assert_equal zone, twz.time_zone
end
end
+
+ def test_parse_far_future_date_with_time_zone_offset_in_string
+ silence_warnings do # silence warnings raised by tzinfo gem
+ zone = TimeZone['Eastern Time (US & Canada)']
+ twz = zone.parse('2050-12-31 19:00:00 -10:00') # i.e., 2050-01-01 05:00:00 UTC
+ assert_equal [0,0,0,1,1,2051], twz.to_a[0,6]
+ assert_equal zone, twz.time_zone
+ end
+ end
uses_mocha 'TestParseWithIncompleteDate' do
def test_parse_with_incomplete_date
Please sign in to comment.
Something went wrong with that request. Please try again.