Changeset 1942

Timestamp:

09/07/07 21:43:43 (1 year ago)

Author:

nahi

Message:

• a Driver generated by a WSDLDriverFactory ignored 'xmlattr_*' value in a Hash parameter. closes #414.
  

Files:

• trunk/lib/soap/mapping/literalregistry.rb (modified) (1 diff)
• trunk/lib/soap/mapping/registry.rb (modified) (2 diffs)
• trunk/lib/soap/mapping/wsdlliteralregistry.rb (modified) (2 diffs)
• trunk/test/wsdl/document/test_rpc.rb (modified) (1 diff)

trunk/lib/soap/mapping/literalregistry.rb

@@ -146 +146 @@
-    return ele if obj.nil?
-    stubobj2soap_elements(obj, ele, definition.elements)
-
-
-
-
-
-
-
+
-    ele
-  end

trunk/lib/soap/mapping/registry.rb

@@ -229 +229 @@
-  
-  def add_attributes2soap(obj, ele)
-
-
-
-
-
-
+
+
-    elsif obj.respond_to?(:__xmlattr)
-      obj.__xmlattr.each do |key, value|
@@ -240 +236 @@
-      end
-    end
+  end
+
+  def add_definedattributes2soap(obj, ele, typedef)
+    if typedef.attributes
+      typedef.attributes.each do |qname, param|
+        ele.extraattr[qname] = get_xmlattr_value(obj, qname)
+      end
+    end
+  end
+
+  def get_xmlattr_value(obj, qname)
+    attrname = 'xmlattr_' + qname.name
+    value = Mapping.get_attribute(obj, attrname)
+    if value.nil?
+      attrname =
+        XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name)
+      value = Mapping.get_attribute(obj, attrname)
+    end
+    value
-  end
-

trunk/lib/soap/mapping/wsdlliteralregistry.rb

@@ -105 +105 @@
-    if type.is_a?(::WSDL::XMLSchema::SimpleType)
-      ele = simpleobj2soap(obj, type)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    ele
-  end
@@ -226 +228 @@
-    end
-  end
+
+  def add_definedattributes2soap(obj, ele, typedef)
+    if typedef.attributes
+      typedef.attributes.each do |at|
+        ele.extraattr[at.name] = get_xmlattr_value(obj, at.name)
+      end
+    end
+  end
-end
-

trunk/test/wsdl/document/test_rpc.rb

@@ -147 +147 @@
-  end
-
+  def test_wsdl_with_map
+    wsdl = File.join(DIR, 'document.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    struct1 = {
+      :m_string => "mystring1",
+      :m_datetime => (now1 = Time.now),
+      :xmlattr_m_attr => "myattr1"
+    }
+    struct2 = {
+      "m_string" => "mystring2",
+      "m_datetime" => now2 = (Time.now),
+      "xmlattr_m_attr" => "myattr2"
+    }
+    echo = {
+      :struct1 => struct1,
+      "struct-2" => struct2,
+      :xmlattr_attr_string => 'attr_string',
+      "xmlattr_attr-int" => 5
+    }
+    ret = @client.echo(echo)
+    #
+    now1str = XSD::XSDDateTime.new(now1).to_s
+    now2str = XSD::XSDDateTime.new(now2).to_s
+    assert_equal("mystring2", ret.struct1.m_string)
+    assert_equal(now2str, ret.struct1.m_datetime)
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal(now1str, ret.struct_2.m_datetime)
+    assert_equal("attr_string", ret.xmlattr_attr_string)
+    assert_equal("5", ret.xmlattr_attr_int)
+  end
+
-  def date2time(date)
-    if date.respond_to?(:to_time)