diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-24 21:14:44 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-24 21:14:44 +0000 |
| commit | 34f6671d68a3fc6d94a7ed6954b71615735fa83b (patch) | |
| tree | 019f130be7623c0624b349b0399b299f6d9c2fc2 | |
| parent | 8b8c7fd386022f30f846ce7fd4c8224d61118b57 (diff) | |
* ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be
UTF-8.
* test/psych/test_encoding.rb: test yaml dump encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/psych/lib/psych/nodes/node.rb | 2 | ||||
| -rw-r--r-- | test/psych/test_encoding.rb | 16 |
3 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Aug 25 06:11:35 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be + UTF-8. + * test/psych/test_encoding.rb: test yaml dump encoding. + Thu Aug 25 01:24:33 2011 Naohisa Goto <ngotogenome@gmail.com> * test/fileutils/test_fileutils.rb (test_chmod_symbol_mode): Solaris diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb index 7c040ec463..2a5573a2bd 100644 --- a/ext/psych/lib/psych/nodes/node.rb +++ b/ext/psych/lib/psych/nodes/node.rb @@ -41,7 +41,7 @@ module Psych # # See also Psych::Visitors::Emitter def to_yaml io = nil, options = {} - real_io = io || StringIO.new + real_io = io || StringIO.new(''.encode('utf-8')) Visitors::Emitter.new(real_io, options).accept self return real_io.string unless io diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb index 029ff75ed9..a341c47859 100644 --- a/test/psych/test_encoding.rb +++ b/test/psych/test_encoding.rb @@ -40,6 +40,22 @@ module Psych assert_match(/alias value/, e.message) end + def test_to_yaml_is_valid + ext_before = Encoding.default_external + int_before = Encoding.default_internal + + Encoding.default_external = Encoding::US_ASCII + Encoding.default_internal = nil + + s = "こんにちは！" + # If no encoding is specified, use UTF-8 + assert_equal Encoding::UTF_8, Psych.dump(s).encoding + assert_equal s, Psych.load(Psych.dump(s)) + ensure + Encoding.default_external = ext_before + Encoding.default_internal = int_before + end + def test_start_mapping foo = 'foo' bar = 'バー' |