summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-09 00:06:29 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-09 00:06:29 +0000
commitc641e4b23e674e784258b1b3a86df5fb1091753a (patch)
tree0f642ab8f0571076efe5d94ceefb22b4467dbaf8
parentc84bb5df6dff60d17ff692306aa94fd53bed9638 (diff)
* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
from YAML files. * ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be dumped to YAML files. * test/psych/test_class.rb: corresponding test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/psych/lib/psych/visitors/to_ruby.rb2
-rw-r--r--ext/psych/lib/psych/visitors/yaml_tree.rb3
-rw-r--r--test/psych/test_class.rb12
4 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4549ce2..6f0813f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 9 09:05:04 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
+ from YAML files.
+ * ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be
+ dumped to YAML files.
+ * test/psych/test_class.rb: corresponding test.
+
Wed Jun 8 21:38:57 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* cont.c (root_fiber_alloc): set root fiber's status RUNNING.
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index f8b1585..cb0afd2 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -57,6 +57,8 @@ module Psych
Complex(o.value)
when "!ruby/object:Rational"
Rational(o.value)
+ when "!ruby/class"
+ resolve_class o.value
when "tag:yaml.org,2002:float", "!float"
Float(@ss.tokenize(o.value))
when "!ruby/regexp"
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 6f90377..de35c76 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -247,7 +247,8 @@ module Psych
end
def visit_Class o
- raise TypeError, "can't dump anonymous class #{o.class}"
+ raise TypeError, "can't dump anonymous class: #{o}" unless o.name
+ @emitter.scalar o.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED
end
def visit_Range o
diff --git a/test/psych/test_class.rb b/test/psych/test_class.rb
index cba88ba..8fd4ad0 100644
--- a/test/psych/test_class.rb
+++ b/test/psych/test_class.rb
@@ -2,16 +2,18 @@ require 'psych/helper'
module Psych
class TestClass < TestCase
- def test_cycle
+ def test_cycle_anonymous_class
assert_raises(::TypeError) do
- assert_cycle(TestClass)
+ assert_cycle(Class.new)
end
end
+ def test_cycle
+ assert_cycle(TestClass)
+ end
+
def test_dump
- assert_raises(::TypeError) do
- Psych.dump TestClass
- end
+ Psych.dump TestClass
end
end
end