From a1656129c40a6c27a387a0eb45541a0a3a4dd948 Mon Sep 17 00:00:00 2001 From: Joe Eli McIlvain Date: Thu, 15 Jan 2015 18:04:45 -0800 Subject: Only dump ivars for subclasses of Hash, not for Hash. Fixes #216. Fixes part of #217. --- lib/psych/visitors/yaml_tree.rb | 77 +++++++++++++++++++++++------------------ test/psych/test_hash.rb | 6 ---- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index f6427ce..35ebb27 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -367,45 +367,15 @@ module Psych end def visit_Hash o - ivars = o.instance_variables - - if ivars.any? - tag = "!ruby/hash-with-ivars" - tag << ":#{o.class}" unless o.class == ::Hash - - register(o, @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK)) - - @emitter.scalar 'elements', nil, nil, true, false, Nodes::Scalar::ANY - - @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK + if o.class == ::Hash + register(o, @emitter.start_mapping(nil, nil, true, Psych::Nodes::Mapping::BLOCK)) o.each do |k,v| accept k accept v end @emitter.end_mapping - - @emitter.scalar 'ivars', nil, nil, true, false, Nodes::Scalar::ANY - - @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK - o.instance_variables.each do |ivar| - accept ivar - accept o.instance_variable_get ivar - end - @emitter.end_mapping - - @emitter.end_mapping else - tag = o.class == ::Hash ? nil : "!ruby/hash:#{o.class}" - implicit = !tag - - register(o, @emitter.start_mapping(nil, tag, implicit, Psych::Nodes::Mapping::BLOCK)) - - o.each do |k,v| - accept k - accept v - end - - @emitter.end_mapping + visit_hash_subclass o end end @@ -468,7 +438,8 @@ module Psych def visit_array_subclass o tag = "!ruby/array:#{o.class}" - if o.instance_variables.empty? + ivars = o.instance_variables + if ivars.empty? node = @emitter.start_sequence(nil, tag, false, Nodes::Sequence::BLOCK) register o, node o.each { |c| accept c } @@ -486,12 +457,50 @@ module Psych # Dump the ivars accept 'ivars' @emitter.start_mapping(nil, nil, true, Nodes::Sequence::BLOCK) + ivars.each do |ivar| + accept ivar + accept o.instance_variable_get ivar + end + @emitter.end_mapping + + @emitter.end_mapping + end + end + + def visit_hash_subclass o + ivars = o.instance_variables + if ivars.any? + tag = "!ruby/hash-with-ivars:#{o.class}" + node = @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK) + register(o, node) + + # Dump the elements + accept 'elements' + @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK + o.each do |k,v| + accept k + accept v + end + @emitter.end_mapping + + # Dump the ivars + accept 'ivars' + @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK o.instance_variables.each do |ivar| accept ivar accept o.instance_variable_get ivar end @emitter.end_mapping + @emitter.end_mapping + else + tag = "!ruby/hash:#{o.class}" + node = @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK) + register(o, node) + o.each do |k,v| + accept k + accept v + end @emitter.end_mapping end end diff --git a/test/psych/test_hash.rb b/test/psych/test_hash.rb index 066df66..e658984 100644 --- a/test/psych/test_hash.rb +++ b/test/psych/test_hash.rb @@ -38,12 +38,6 @@ module Psych assert_cycle t1 end - def test_hash_with_ivars - @hash.instance_variable_set :@foo, 'bar' - dup = Psych.load Psych.dump @hash - assert_equal 'bar', dup.instance_variable_get(:@foo) - end - def test_hash_subclass_with_ivars x = X.new x[:a] = 'b' -- cgit v1.2.1 From 461a56db2e64566d166ff62265fedad0752990d2 Mon Sep 17 00:00:00 2001 From: Joe Eli McIlvain Date: Thu, 15 Jan 2015 18:08:50 -0800 Subject: Only dump ivars for subclasses of String, not for String. With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217. --- lib/psych/visitors/yaml_tree.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index 35ebb27..c1039c6 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -325,10 +325,11 @@ module Psych style = Nodes::Scalar::SINGLE_QUOTED end - ivars = find_ivars o + is_primitive = o.class == ::String + ivars = find_ivars o, is_primitive if ivars.empty? - unless o.class == ::String + unless is_primitive tag = "!ruby/string:#{o.class}" plain = false quote = false @@ -533,7 +534,7 @@ module Psych end # FIXME: remove this method once "to_yaml_properties" is removed - def find_ivars target + def find_ivars target, is_primitive=false begin loc = target.method(:to_yaml_properties).source_location.first unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb') @@ -547,7 +548,7 @@ module Psych # and it's OK to skip it since it's only to emit a warning. end - target.instance_variables + is_primitive ? [] : target.instance_variables end def register target, yaml_obj -- cgit v1.2.1