Ruby 1.9.2: marshaling round-trips Time#zone

activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb → activesupport/lib/active_support/core_ext/time/marshal.rb

 # Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
 # unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
 # methods so that utc instances can be flagged on dump, and coerced back to utc on load.
-if RUBY_VERSION < '1.9'
+if !Marshal.load(Marshal.dump(Time.now.utc)).utc?
   class Time
     class << self
-      alias_method :_original_load, :_load
+      alias_method :_load_without_utc_flag, :_load
       def _load(marshaled_time)
-        time = _original_load(marshaled_time)
+        time = _load_without_utc_flag(marshaled_time)
         time.instance_eval do
           if defined?(@marshal_with_utc_coercion)
             val = remove_instance_variable("@marshal_with_utc_coercion")
@@ -16,11 +16,41 @@ def _load(marshaled_time)
       end
     end
 
-    alias_method :_original_dump, :_dump
+    alias_method :_dump_without_utc_flag, :_dump
     def _dump(*args)
       obj = dup
       obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
-      obj._original_dump(*args)
+      obj._dump_without_utc_flag(*args)
+    end
+  end
+end
+
+# Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only
+# preserves utc_offset. Preserve zone also, even though it may not
+# work in some edge cases.
+if Time.local(2010).zone != Marshal.load(Marshal.dump(Time.local(2010))).zone
+  class Time
+    class << self
+      alias_method :_load_without_zone, :_load
+      def _load(marshaled_time)
+        time = _load_without_zone(marshaled_time)
+        time.instance_eval do
+          if zone = defined?(@_zone) && remove_instance_variable('@_zone')
+            ary = to_a
+            ary[-1] = zone
+            utc? ? Time.utc(*ary) : Time.local(*ary)
+          else
+            self
+          end
+        end
+      end
+    end
+
+    alias_method :_dump_without_zone, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@_zone', zone)
+      obj._dump_without_zone(*args)
     end
   end
 end

activesupport/lib/active_support/time.rb

@@ -14,7 +14,7 @@ module ActiveSupport
 require 'time'
 
 require 'active_support/core_ext/time/publicize_conversion_methods'
-require 'active_support/core_ext/time/marshal_with_utc_flag'
+require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'
 require 'active_support/core_ext/time/conversions'

activesupport/test/core_ext/time_ext_test.rb

@@ -758,33 +758,29 @@ def time_is_64bits?
 class TimeExtMarshalingTest < Test::Unit::TestCase
   def test_marshaling_with_utc_instance
     t = Time.utc(2000)
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal "UTC", unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 
   def test_marshaling_with_local_instance
     t = Time.local(2000)
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal t.zone, unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 
   def test_marshaling_with_frozen_utc_instance
     t = Time.utc(2000).freeze
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal "UTC", unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 
   def test_marshaling_with_frozen_local_instance
     t = Time.local(2000).freeze
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal t.zone, unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 end

activesupport/test/message_encryptor_test.rb

@@ -4,7 +4,7 @@
 class MessageEncryptorTest < Test::Unit::TestCase
   def setup
     @encryptor = ActiveSupport::MessageEncryptor.new(ActiveSupport::SecureRandom.hex(64))
-    @data = {:some=>"data", :now=>Time.now}
+    @data = { :some => "data", :now => Time.local(2010) }
   end
   
   def test_simple_round_tripping

activesupport/test/message_verifier_test.rb

@@ -12,7 +12,7 @@
 class MessageVerifierTest < Test::Unit::TestCase
   def setup
     @verifier = ActiveSupport::MessageVerifier.new("Hey, I'm a secret!")
-    @data = {:some=>"data", :now=>Time.now}
+    @data = { :some => "data", :now => Time.local(2010) }
   end
 
   def test_simple_round_tripping