supporting legacy structs

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index 2f6c3b6..2f94be8 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/lib/psych/visitors/to_ruby.rb
@@ -86,9 +86,22 @@ module Psych
           h = Hash[*o.children.map { |c| accept c }].to_a
 
           if klassname && klassname.length > 1
-            s = klassname.sub(/^:/,'').split('::').inject(Object) { |k,sub|
-              k.const_get sub
-            }.allocate
+            name    = klassname.sub(/^:/, '')
+            s       = nil
+            retried = false
+
+            begin
+              s = name.split('::').inject(Object) { |k,sub|
+                k.const_get sub
+              }.allocate
+            rescue NameError => ex
+              name    = "Struct::#{name}"
+              unless retried
+                retried = true
+                retry
+              end
+              raise ex
+            end
             h.each { |k,v| s.send("#{k}=", v) }
             s
           else