diff options
| -rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 14 | ||||
| -rw-r--r-- | test/psych/test_merge_keys.rb | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index a922f90831..ec80701917 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -337,18 +337,12 @@ module Psych list end - SHOVEL = '<<' def revive_hash hash, o o.children.each_slice(2) { |k,v| key = accept(k) - if @symbolize_names - key = key.to_sym - elsif !@freeze - key = deduplicate(key) - end val = accept(v) - if key == SHOVEL && k.tag != "tag:yaml.org,2002:str" + if key == '<<' && k.tag != "tag:yaml.org,2002:str" case v when Nodes::Alias, Nodes::Mapping begin @@ -370,6 +364,12 @@ module Psych hash[key] = val end else + if @symbolize_names + key = key.to_sym + elsif !@freeze + key = deduplicate(key) + end + hash[key] = val end diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb index 1bc3dd1cb6..08ffe58fa8 100644 --- a/test/psych/test_merge_keys.rb +++ b/test/psych/test_merge_keys.rb @@ -17,6 +17,16 @@ map: assert_equal hash, doc end + def test_merge_key_with_bare_hash_symbolized_names + doc = Psych.load <<-eodoc, symbolize_names: true +map: + <<: + hello: world + eodoc + hash = { map: { hello: "world" } } + assert_equal hash, doc + end + def test_roundtrip_with_chevron_key h = {} v = { 'a' => h, '<<' => h } |