* ext/psych/lib/psych/visitors/yaml_tree.rb: ascii only binary strings

  will be dumped as unicode.  Thanks Paul Kunysch!

* test/psych/test_string.rb: appropriate test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 21 insertions, 2 deletions

diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb
index 77aefc6dae..0c5d4d2625 100644
--- a/test/psych/test_string.rb
+++ b/test/psych/test_string.rb
@@ -9,6 +9,12 @@ module Psych
       attr_accessor :val
     end
 
+    class Z < String
+      def initialize
+        force_encoding Encoding::US_ASCII
+      end
+    end
+
     def test_another_subclass_with_attributes
       y = Psych.load Psych.dump Y.new("foo").tap {|y| y.val = 1}
       assert_equal "foo", y
@@ -28,6 +34,12 @@ module Psych
       assert_equal X, x.class
     end
 
+    def test_empty_character_subclass
+      assert_match "!ruby/string:#{Z}", Psych.dump(Z.new)
+      x = Psych.load Psych.dump Z.new
+      assert_equal Z, x.class
+    end
+
     def test_subclass_with_attributes
       y = Psych.load Psych.dump Y.new.tap {|y| y.val = 1}
       assert_equal Y, y.class
@@ -40,8 +52,8 @@ module Psych
       assert_equal '01:03:05', Psych.load(yaml)
     end
 
-    def test_tagged_binary_should_be_dumped_as_binary
-      string = "hello world!"
+    def test_nonascii_string_as_binary
+      string = "hello \x80 world!"
       string.force_encoding 'ascii-8bit'
       yml = Psych.dump string
       assert_match(/binary/, yml)
@@ -69,6 +81,13 @@ module Psych
       assert_equal string, Psych.load(yml)
     end
 
+    def test_ascii_only_8bit_string
+      string = "abc".encode(Encoding::ASCII_8BIT)
+      yml = Psych.dump string
+      refute_match(/binary/, yml)
+      assert_equal string, Psych.load(yml)
+    end
+
     def test_string_with_ivars
       food = "is delicious"
       ivar = "on rock and roll"