From 7309f9cc007f1cc05eb70967356069161d867356 Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 24 Apr 2010 04:11:27 +0000
Subject: * ext/psych/lib/psych.rb: supporting deprecated syck method  
 add_ruby_type * ext/psych/lib/psych/visitors/to_ruby.rb: ditto *
 test/psych/test_deprecated.rb: ditto * test/psych/test_psych.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/psych/test_deprecated.rb | 16 ++++++++++++++++
 test/psych/test_psych.rb      | 23 ++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

(limited to 'test/psych')

diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb
index 41106ffcfd..c93b36ed44 100644
--- a/test/psych/test_deprecated.rb
+++ b/test/psych/test_deprecated.rb
@@ -2,6 +2,10 @@ require_relative 'helper'
 
 module Psych
   class TestDeprecated < TestCase
+    def teardown
+      Psych.domain_types.clear
+    end
+
     class QuickEmitter
       attr_reader :name
       attr_reader :value
@@ -147,5 +151,17 @@ module Psych
     def test_yaml_as
       assert_match(/helloworld/, Psych.dump(YamlAs.new))
     end
+
+    def test_ruby_type
+      types = []
+      appender = lambda { |*args| types << args }
+
+      Psych.add_ruby_type('foo', &appender)
+      Psych.load <<-eoyml
+- !ruby.yaml.org,2002/foo bar
+      eoyml
+
+      assert_equal [["tag:ruby.yaml.org,2002:foo", "bar"]], types
+    end
   end
 end
diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb
index 91c67b1664..78f022c1fb 100644
--- a/test/psych/test_psych.rb
+++ b/test/psych/test_psych.rb
@@ -4,6 +4,10 @@ require 'stringio'
 require 'tempfile'
 
 class TestPsych < Psych::TestCase
+  def teardown
+    Psych.domain_types.clear
+  end
+
   def test_load_argument_error
     assert_raises(TypeError) do
       Psych.load nil
@@ -56,7 +60,7 @@ class TestPsych < Psych::TestCase
     Psych.add_builtin_type 'omap', do |type, val|
       got = val
     end
-    Psych.load('--- !omap hello')
+    Psych.load('--- !!omap hello')
     assert_equal 'hello', got
   ensure
     Psych.remove_type 'omap'
@@ -98,4 +102,21 @@ class TestPsych < Psych::TestCase
     assert_equal false, Psych.load('')
     assert_equal false, Psych.parse('')
   end
+
+  def test_callbacks
+    types = []
+    appender = lambda { |*args| types << args }
+
+    Psych.add_builtin_type('foo', &appender)
+    Psych.add_domain_type('example.com,2002', 'foo', &appender)
+    Psych.load <<-eoyml
+- !tag:yaml.org,2002:foo bar
+- !tag:example.com,2002:foo bar
+    eoyml
+
+    assert_equal [
+      ["tag:yaml.org,2002:foo", "bar"],
+      ["tag:example.com,2002:foo", "bar"]
+    ], types
+  end
 end
-- 
cgit v1.2.3