From 2a58706e2d31abd5f708942254d46cda35aa60dd Mon Sep 17 00:00:00 2001 From: tenderlove Date: Fri, 5 Apr 2013 18:12:52 +0000 Subject: [PATCH] * ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in coder emission. Thanks @tjwallace * test/psych/test_coder.rb: test for change git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/psych/lib/psych/visitors/yaml_tree.rb | 2 +- test/psych/test_coder.rb | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 304ecaba28..077aafcf22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Apr 6 03:11:07 2013 Aaron Patterson + + * ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in coder + emission. Thanks @tjwallace + * test/psych/test_coder.rb: test for change + Sat Apr 6 02:54:08 2013 Aaron Patterson * ext/psych/lib/psych/exception.rb: there should be only one exception diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb index 6b6a5ffa19..96640e0267 100644 --- a/ext/psych/lib/psych/visitors/yaml_tree.rb +++ b/ext/psych/lib/psych/visitors/yaml_tree.rb @@ -463,7 +463,7 @@ module Psych when :map @emitter.start_mapping nil, c.tag, c.implicit, c.style c.map.each do |k,v| - @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY + accept k accept v end @emitter.end_mapping diff --git a/test/psych/test_coder.rb b/test/psych/test_coder.rb index 4809b13d5d..7571e89c9d 100644 --- a/test/psych/test_coder.rb +++ b/test/psych/test_coder.rb @@ -85,7 +85,7 @@ module Psych end def encode_with coder - coder.represent_map self.class.name, { 'a' => 'b' } + coder.represent_map self.class.name, { "string" => 'a', :symbol => 'b' } end end @@ -131,7 +131,7 @@ module Psych def test_represent_map thing = Psych.load(Psych.dump(RepresentWithMap.new)) - assert_equal({ 'a' => 'b' }, thing.map) + assert_equal({ "string" => 'a', :symbol => 'b' }, thing.map) end def test_represent_sequence