Enable YAML serialization of Ruby delegators and simple delegators

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb
index 1cb2137..677f5a6 100644
--- a/lib/psych/visitors/yaml_tree.rb
+++ b/lib/psych/visitors/yaml_tree.rb
@@ -171,6 +171,8 @@ module Psych
         @emitter.end_mapping
       end
 
+      alias :visit_Delegator :visit_Object
+
       def visit_Struct o
         tag = ['!ruby/struct', o.class.name].compact.join(':')
 
diff --git a/test/psych/visitors/test_yaml_tree.rb b/test/psych/visitors/test_yaml_tree.rb
index 40702bc..65cc90e 100644
--- a/test/psych/visitors/test_yaml_tree.rb
+++ b/test/psych/visitors/test_yaml_tree.rb
@@ -3,6 +3,15 @@ require 'psych/helper'
 module Psych
   module Visitors
     class TestYAMLTree < TestCase
+      class TestDelegatorClass < Delegator
+        def initialize(obj); super; @obj = obj; end
+        def __setobj__(obj); @obj = obj; end
+        def __getobj__; @obj; end
+      end
+
+      class TestSimpleDelegatorClass < SimpleDelegator
+      end
+
       def setup
         super
         @v = Visitors::YAMLTree.create
@@ -168,6 +177,14 @@ module Psych
         assert_cycle 'nUll'
         assert_cycle '~'
       end
+
+      def test_delegator
+        assert_cycle(TestDelegatorClass.new([1, 2, 3]))
+      end
+
+      def test_simple_delegator
+        assert_cycle(TestSimpleDelegatorClass.new([1, 2, 3]))
+      end
     end
   end
 end