Changeset 1725

Timestamp:

09/25/06 13:14:49 (2 years ago)

Author:

nahi

Message:

SOAP::Mapping::Object could not be dumped with Ruby's Marshal; 'singleton can't be dumped'.
adoption of instance_eval instead of define_method for #224 causes this problem.
added custom marshalling methods.
closes #266.

Files:

• trunk/lib/soap/mapping/registry.rb (modified) (5 diffs)

trunk/lib/soap/mapping/registry.rb

@@ -32 +32 @@
-
-# For anyType object: SOAP::Mapping::Object not ::Object
-; include Marshallable
+
-  def initialize
-    @__xmlele_type = {}
@@ -102 +102 @@
-  end
-
+  def marshal_load(dumpobj)
+    __import(dumpobj)
+  end
+
-private
-
@@ -109 +113 @@
-    # untaint depends GenSupport.safemethodname
-    name = XSD::CodeGen::GenSupport.safemethodname(qname.name).untaint
-
+on 
-    qnamedump = qname.dump.untaint
+    singleton = false
-    unless self.respond_to?(name)
+      singleton = true
-      instance_eval <<-EOS
-        def #{name}
@@ -119 +125 @@
-    end
-    unless self.respond_to?(name + "=")
+      singleton = true
-      instance_eval <<-EOS
-        def #{name}=(value)
-          self[#{qnamedump}] = value
+        end
+      EOS
+    end
+    if singleton && !self.respond_to?(:marshal_dump)
+      instance_eval <<-EOS
+        def marshal_dump
+          __export
-        end
-      EOS
@@ -139 +153 @@
-    end
-  end
+
+  def __export
+    dumpobj = ::SOAP::Mapping::Object.new
+    dumpobj.__xmlele.replace(@__xmlele)
+    dumpobj.__xmlattr.replace(@__xmlattr)
+    dumpobj
+  end
+
+  def __import(dumpobj)
+    @__xmlele_type = {}
+    @__xmlele = []
+    @__xmlattr = {}
+    dumpobj.__xmlele.each do |qname, value|
+      __add_xmlele_value(qname, value)
+    end
+    @__xmlattr.replace(dumpobj.__xmlattr)
+  end
-end
-