Changeset 8975

Timestamp:

03/03/08 03:49:37 (1 year ago)

Author:

gbuesing

Message:

Adding TimeWithZone #marshal_dump and #marshal_load

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Adding TimeWithZone #marshal_dump and #marshal_load [Geoff Buesing]
-
-* Add OrderedHash#to_hash [josh]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -188 +188 @@
-    def freeze
-      self
+    end
+
+    def marshal_dump
+      [utc, time_zone.name, time]
+    end
+    
+    def marshal_load(variables)
+      initialize(variables[0], ::TimeZone[variables[1]], variables[2])
-    end
-  

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -209 +209 @@
-      assert_instance_of ActiveSupport::TimeWithZone, @twz.months_since(1)
-      assert_equal Time.utc(2000, 1, 31, 19, 0 ,0), @twz.months_since(1).time
+    end
+    
+    def test_marshal_dump_and_load
+      marshal_str = Marshal.dump(@twz)
+      mtime = Marshal.load(marshal_str)
+      assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
+      assert_equal TimeZone['Eastern Time (US & Canada)'], mtime.time_zone
+      assert_equal Time.utc(1999, 12, 31, 19), mtime.time
-    end
-