@@ -1,5 +1,7 @@ *2.1.1 (next release)* +* Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone [Geoff Buesing] + * Added StringQuestioneer for doing things like StringQuestioneer.new("production").production? # => true and StringQuestioneer.new("production").development? # => false [DHH] * Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger) activesupport/CHANGELOG @@ -246,7 +246,7 @@ module ActiveSupport end def marshal_load(variables) - initialize(variables[0], ::Time.send!(:get_zone, variables[1]), variables[2]) + initialize(variables[0].utc, ::Time.send!(:get_zone, variables[1]), variables[2].utc) end # Ensure proxy class responds to all methods that underlying time instance responds to. activesupport/lib/active_support/time_with_zone.rb @@ -320,8 +320,11 @@ class TimeWithZoneTest < Test::Unit::TestCase marshal_str = Marshal.dump(@twz) mtime = Marshal.load(marshal_str) assert_equal Time.utc(2000, 1, 1, 0), mtime.utc + assert mtime.utc.utc? assert_equal ActiveSupport::TimeZone['Eastern Time (US & Canada)'], mtime.time_zone assert_equal Time.utc(1999, 12, 31, 19), mtime.time + assert mtime.time.utc? + assert_equal @twz.inspect, mtime.inspect end end @@ -331,8 +334,11 @@ class TimeWithZoneTest < Test::Unit::TestCase marshal_str = Marshal.dump(twz) mtime = Marshal.load(marshal_str) assert_equal Time.utc(2000, 1, 1, 0), mtime.utc + assert mtime.utc.utc? assert_equal 'America/New_York', mtime.time_zone.name assert_equal Time.utc(1999, 12, 31, 19), mtime.time + assert mtime.time.utc? + assert_equal @twz.inspect, mtime.inspect end end activesupport/test/core_ext/time_with_zone_test.rb 6e58a254942eb6d7b508452bb7b5b418607dc272 gbuesing gbuesing@gmail.com http://github.com/rails/rails/commit/e6ad7ff466f045b30c7b07e8ee5f3865c9604687 e6ad7ff466f045b30c7b07e8ee5f3865c9604687 2008-07-14T21:26:48-07:00 2008-07-14T21:26:48-07:00 Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone 076cd1017b4e935b89905dc29074c7ae721ebb41 gbuesing gbuesing@gmail.com