summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-06-08 17:28:41 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-06-08 18:58:57 -0700
commit81a8408b358df3710b7ebdd76bec99aeea3580ed (patch)
tree3d7be110458dfe6b5b18cc117392229f9fcd65ec
parente28d3dbca422250d291e98d39d9c4ef2317e3b8c (diff)
downloadpsych-81a8408b358df3710b7ebdd76bec99aeea3580ed.zip
adding module serialization support
-rw-r--r--lib/psych/visitors/to_ruby.rb2
-rw-r--r--lib/psych/visitors/yaml_tree.rb5
-rw-r--r--test/psych/test_class.rb17
3 files changed, 23 insertions, 1 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index cb0afd2..3f5be4d 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/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/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb
index de35c76..4019859 100644
--- a/lib/psych/visitors/yaml_tree.rb
+++ b/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
diff --git a/test/psych/test_class.rb b/test/psych/test_class.rb
index 8fd4ad0..156f2fb 100644
--- a/test/psych/test_class.rb
+++ b/test/psych/test_class.rb
@@ -2,12 +2,21 @@ require 'psych/helper'
module Psych
class TestClass < TestCase
+ module Foo
+ end
+
def test_cycle_anonymous_class
assert_raises(::TypeError) do
assert_cycle(Class.new)
end
end
+ def test_cycle_anonymous_module
+ assert_raises(::TypeError) do
+ assert_cycle(Module.new)
+ end
+ end
+
def test_cycle
assert_cycle(TestClass)
end
@@ -15,5 +24,13 @@ module Psych
def test_dump
Psych.dump TestClass
end
+
+ def test_cycle_module
+ assert_cycle(Foo)
+ end
+
+ def test_dump_module
+ Psych.dump Foo
+ end
end
end