[Fixes ruby#19] Fix Marshal loading

marcandre · marcandre · commit 014844ad7cca · 2020-10-06T17:13:37.000-04:00
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
@@ -212,10 +212,7 @@ def marshal_dump # :nodoc:
   #
   # Provides marshalling support for use by the Marshal library.
   #
-  def marshal_load(x) # :nodoc:
-    x.each_key{|key| new_ostruct_member!(key)}
-    @table = x
-  end
+  alias_method :marshal_load, :update_to_values! # :nodoc:
 
   #
   # Used internally to defined properties on the
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
@@ -327,4 +327,10 @@ def test_yaml
     assert_equal true, os1.eql?(os2)
     assert_equal 300.42, os2.pension
   end
+
+  def test_marshal
+    o = OpenStruct.new(name: "John Smith", age: 70, pension: 300.42)
+    o2 = Marshal.load(Marshal.dump(o))
+    assert_equal o, o2
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,7 @@ def marshal_dump # :nodoc:`
`212`	`212`	`#`
`213`	`213`	`# Provides marshalling support for use by the Marshal library.`
`214`	`214`	`#`
`215`		`- def marshal_load(x) # :nodoc:`
`216`		`- x.each_key{\|key\| new_ostruct_member!(key)}`
`217`		`- @table = x`
`218`		`- end`
	`215`	`+ alias_method :marshal_load, :update_to_values! # :nodoc:`
`219`	`216`
`220`	`217`	`#`
`221`	`218`	`# Used internally to defined properties on the`