diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-06 10:51:10 +0200 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-06 10:51:10 +0200 |
commit | 43fa4aa38492c80080efa61aa4b7bee422792bc7 (patch) | |
tree | 3157c1ca1c1adf188f22c883ae6063f206fb3702 | |
parent | 6a191f45986a0ace06b743145364e6e66da46b9b (diff) | |
download | psych-43fa4aa38492c80080efa61aa4b7bee422792bc7.tar.gz |
* ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when
dumping objects with custom coders. [ruby-core:66215] [Bug #10496]
* test/psych/test_coder.rb: test for fix
-rw-r--r-- | CHANGELOG.rdoc | 7 | ||||
-rw-r--r-- | lib/psych/visitors/yaml_tree.rb | 7 | ||||
-rw-r--r-- | test/psych/test_coder.rb | 22 |
3 files changed, 33 insertions, 3 deletions
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index cc4ba23..8438a67 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,10 @@ +Fri Feb 6 17:47:05 2015 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when + dumping objects with custom coders. [ruby-core:66215] [Bug #10496] + + * test/psych/test_coder.rb: test for fix + Fri Feb 6 16:58:31 2015 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index 8841cb0..e13fd77 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -21,6 +21,7 @@ module Psych end def register target, node + return unless target.respond_to? :object_id @targets << target @obj_to_node[target.object_id] = node end @@ -566,10 +567,10 @@ module Psych c = Psych::Coder.new(tag) o.encode_with(c) - emit_coder c + emit_coder c, o end - def emit_coder c + def emit_coder c, o case c.type when :scalar @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, Nodes::Scalar::ANY @@ -580,7 +581,7 @@ module Psych end @emitter.end_sequence when :map - @emitter.start_mapping nil, c.tag, c.implicit, c.style + register o, @emitter.start_mapping(nil, c.tag, c.implicit, c.style) c.map.each do |k,v| accept k accept v diff --git a/test/psych/test_coder.rb b/test/psych/test_coder.rb index 7571e89..e3213e2 100644 --- a/test/psych/test_coder.rb +++ b/test/psych/test_coder.rb @@ -95,6 +95,28 @@ module Psych end end + class Referential + attr_reader :a + + def initialize + @a = self + end + + def encode_with(c) + c['a'] = @a + end + + def init_with(c) + @a = c['a'] + end + end + + def test_self_referential + x = Referential.new + copy = Psych.load Psych.dump x + assert_equal copy, copy.a + end + def test_represent_with_object thing = Psych.load(Psych.dump(RepresentWithObject.new)) assert_equal 20, thing |