From aaa52bf088d9f78d8e578ead12695a73639fc95a Mon Sep 17 00:00:00 2001 From: tenderlove Date: Thu, 9 Jun 2011 00:22:33 +0000 Subject: * ext/psych/lib/psych/visitors/to_ruby.rb: Ruby modules can be loaded from YAML files. * ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby modules can be dumped to YAML files. * test/psych/test_class.rb: corresponding test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/psych/lib/psych/visitors/to_ruby.rb | 2 +- ext/psych/lib/psych/visitors/yaml_tree.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index cb0afd26ba..3f5be4d4da 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -57,7 +57,7 @@ module Psych Complex(o.value) when "!ruby/object:Rational" Rational(o.value) - when "!ruby/class" + when "!ruby/class", "!ruby/module" resolve_class o.value when "tag:yaml.org,2002:float", "!float" Float(@ss.tokenize(o.value)) diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb index de35c7678b..40198599bf 100644 --- a/ext/psych/lib/psych/visitors/yaml_tree.rb +++ b/ext/psych/lib/psych/visitors/yaml_tree.rb @@ -246,6 +246,11 @@ module Psych end end + def visit_Module o + raise TypeError, "can't dump anonymous module: #{o}" unless o.name + @emitter.scalar o.name, nil, '!ruby/module', false, false, Nodes::Scalar::SINGLE_QUOTED + end + def visit_Class o raise TypeError, "can't dump anonymous class: #{o}" unless o.name @emitter.scalar o.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED -- cgit v1.2.3