Changed Psych::Visitors::YAMLTree.binary?(string).

* A human-readable representation can be used for ascii_only 8bit-encoded strings. * String subclasses are binary, even if they are character-encoded.
ruby · Jan 6, 2013 · ef4f041 · ef4f041
1 parent bdd8e9d
commit ef4f041
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb
@@ -221,9 +221,10 @@ def visit_BigDecimal o
       end
 
       def binary? string
-        string.encoding == Encoding::ASCII_8BIT ||
+        (string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?) ||
           string.index("\x00") ||
-          string.count("\x00-\x7F", "^ -~\t\r\n").fdiv(string.length) > 0.3
+          string.count("\x00-\x7F", "^ -~\t\r\n").fdiv(string.length) > 0.3 ||
+          string.class != String
       end
       private :binary?