adding init api

2 files changed, 21 insertions, 8 deletions

diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index ab5e766..3b53edb 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/lib/psych/visitors/to_ruby.rb
@@ -173,7 +173,11 @@ module Psych
 
       private
       def init_with o, h
-        h.each { |k,v| o.instance_variable_set(:"@#{k}", v) }
+        if o.respond_to?(:init_with)
+          o.init_with h
+        else
+          h.each { |k,v| o.instance_variable_set(:"@#{k}", v) }
+        end
         o
       end
 
diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb
index 52f5595..bbcb1c0 100644
--- a/lib/psych/visitors/yaml_tree.rb
+++ b/lib/psych/visitors/yaml_tree.rb
@@ -233,13 +233,22 @@ module Psych
       end
 
       def dump_ivars target, map
-        ivars = target.respond_to?(:to_yaml_properties) ?
-          target.to_yaml_properties :
-          target.instance_variables
-
-        ivars.each do |iv|
-          map.children << Nodes::Scalar.new("#{iv.to_s.sub(/^@/, '')}")
-          accept target.instance_variable_get(iv)
+        if target.respond_to?(:encode_with)
+          coder = {}
+          target.encode_with(coder)
+          coder.each do |k,v|
+            map.children << Nodes::Scalar.new(k)
+            accept v
+          end
+        else
+          ivars = target.respond_to?(:to_yaml_properties) ?
+            target.to_yaml_properties :
+            target.instance_variables
+
+          ivars.each do |iv|
+            map.children << Nodes::Scalar.new("#{iv.to_s.sub(/^@/, '')}")
+            accept target.instance_variable_get(iv)
+          end
         end
       end
     end