diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index a10018812b..4d98850f75 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -339,7 +339,7 @@ module Psych list end - def revive_hash hash, o + def revive_hash hash, o, tagged= false o.children.each_slice(2) { |k,v| key = accept(k) val = accept(v) @@ -366,7 +366,7 @@ module Psych hash[key] = val end else - if @symbolize_names + if !tagged && @symbolize_names key = key.to_sym elsif !@freeze key = deduplicate(key) @@ -404,7 +404,7 @@ module Psych def revive klass, node s = register(node, klass.allocate) - init_with(s, revive_hash({}, node), node) + init_with(s, revive_hash({}, node, true), node) end def init_with o, h, node diff --git a/test/psych/test_marshalable.rb b/test/psych/test_marshalable.rb index b1f4a837f5..152cc4e11f 100644 --- a/test/psych/test_marshalable.rb +++ b/test/psych/test_marshalable.rb @@ -51,5 +51,13 @@ module Psych assert(PsychCustomMarshalable === loaded) assert_equal(2, loaded.foo) end + + def test_init_symbolize_names + obj = PsychCustomMarshalable.new(1) + loaded = Psych.load(Psych.dump(obj), symbolize_names: true) + + assert(PsychCustomMarshalable === loaded) + assert_equal(2, loaded.foo) + end end end