3 files changed, 126 insertions, 0 deletions
diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb
new file mode 100644
index 0000000..ff35fcd
--- /dev/null
+++ b/test/psych/test_to_yaml_properties.rb
@@ -0,0 +1,64 @@
+require 'minitest/autorun'
+require 'psych'
+
+module Psych
+  class TestToYamlProperties < MiniTest::Unit::TestCase
+    class Foo
+      attr_accessor :a, :b, :c
+      def initialize
+        @a = 1
+        @b = 2
+        @c = 3
+      end
+
+      def to_yaml_properties
+        [:@a, :@b]
+      end
+    end
+
+    def test_object_dump_yaml_properties
+      foo = Psych.load(Psych.dump(Foo.new))
+      assert_equal 1, foo.a
+      assert_equal 2, foo.b
+      assert_nil foo.c
+    end
+
+    class Bar < Struct.new(:foo, :bar)
+      attr_reader :baz
+      def initialize *args
+        super
+        @baz = 'hello'
+      end
+
+      def to_yaml_properties
+        []
+      end
+    end
+
+    def test_struct_dump_yaml_properties
+      bar = Psych.load(Psych.dump(Bar.new('a', 'b')))
+      assert_equal 'a', bar.foo
+      assert_equal 'b', bar.bar
+      assert_nil bar.baz
+    end
+
+    def test_string_dump
+      string = "okonomiyaki"
+      class << string
+        def to_yaml_properties
+          [:@tastes]
+        end
+      end
+
+      string.instance_variable_set(:@tastes, 'delicious')
+      v = Psych.load Psych.dump string
+      assert_equal 'delicious', v.instance_variable_get(:@tastes)
+    end
+
+    def test_string_load_syck
+      str = Psych.load("--- !str \nstr: okonomiyaki\n:@tastes: delicious\n")
+      assert_equal 'okonomiyaki', str
+      assert_equal 'delicious', str.instance_variable_get(:@tastes)
+    end
+  end
+end
diff --git a/test/visitors/test_emitter.rb b/test/visitors/test_emitter.rb
index e79a7b5..f440678 100644
--- a/test/visitors/test_emitter.rb
+++ b/test/visitors/test_emitter.rb
@@ -59,6 +59,21 @@ module Psych
         assert_equal @io.string, s.to_yaml
       end
 
+      def test_scalar_with_tag
+        s       = Nodes::Stream.new
+        doc     = Nodes::Document.new
+        scalar  = Nodes::Scalar.new 'hello world', nil, '!str', false, false, 5
+
+        doc.children << scalar
+        s.children << doc
+
+        @visitor.accept s
+
+        assert_match(/str/, @io.string)
+        assert_match(/hello/, @io.string)
+        assert_equal @io.string, s.to_yaml
+      end
+
       def test_sequence
         s       = Nodes::Stream.new
         doc     = Nodes::Document.new
diff --git a/test/yaml/test_string.rb b/test/yaml/test_string.rb
new file mode 100644
index 0000000..7857672
--- /dev/null
+++ b/test/yaml/test_string.rb
@@ -0,0 +1,47 @@
+require 'test/unit'
+require 'psych'
+
+YAML = Psych
+
+module YAML
+  class TestString < Test::Unit::TestCase
+    def test_binary_string_null
+      string = "\x00"
+      yml = YAML.dump string
+      assert_match(/binary/, yml)
+      assert_equal string, YAML.load(yml)
+    end
+
+    def test_binary_string
+      string = binary_string
+      yml = YAML.dump string
+      assert_match(/binary/, yml)
+      assert_equal string, YAML.load(yml)
+    end
+
+    def test_non_binary_string
+      string = binary_string(0.29)
+      yml = YAML.dump string
+      refute_match(/binary/, yml)
+      assert_equal string, YAML.load(yml)
+    end
+
+    def test_string_with_ivars
+      food = "is delicious"
+      ivar = "on rock and roll"
+      food.instance_variable_set(:@we_built_this_city, ivar)
+
+      str = YAML.load YAML.dump food
+      assert_equal ivar, food.instance_variable_get(:@we_built_this_city)
+    end
+
+    def binary_string percentage = 0.31, length = 100
+      string = ''
+      (percentage * length).to_i.times do |i|
+        string << "\b"
+      end
+      string << 'a' * (length - string.length)
+      string
+    end
+  end
+end