Changeset 1835

Timestamp:

06/06/07 15:15:43 (1 year ago)

Author:

nahi

Message:

• abstract type embedded in another type was not propertly unmarshalled with the LiteralRegistry? which is generated by wsdl2ruby.rb. closes #356.
  

Files:

• trunk/lib/soap/mapping/literalregistry.rb (modified) (1 diff)
• trunk/test/wsdl/abstract/test_abstract.rb (modified) (1 diff)

trunk/lib/soap/mapping/literalregistry.rb

@@ -188 +188 @@
-
-  def any2obj(node, obj_class = nil)
+    is_compound = node.is_a?(::SOAP::SOAPCompoundtype)
+    # trust xsi:type first
+    if is_compound and node.type
+      definition = schema_definition_from_type(node.type)
+    end
+    # element name next
+    definition ||= schema_definition_from_elename(node.elename)
+    # class defined in parent type last
-    if obj_class
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-      if definition
-        return elesoap2stubobj(node, obj_class, definition)

trunk/test/wsdl/abstract/test_abstract.rb

@@ -141 +141 @@
-    assert_equal(author.lastname, ret.lastname)
-    assert_equal(author.nonuserid, ret.nonuserid)
+    assert_equal(NonUserAuthor, ret.class)
-  end
-