Changeset 1846

Timestamp:

06/12/07 23:55:54 (1 year ago)

Author:

nahi

Message:

• SOAPElement.from_obj(obj): allow to set XML attribute.
  This method is called when you pass a Hash or [['key1', 'value1'], ...] to
  literal service so you can easily add XML attribute to a request.
  

when obj is a Hash or an Array:

when key starts with "xmlattr_":

value is added as an XML attribute with the key name however the
"xmlattr_" is dropped from the name.

when key starts with "xmlele_":

value is added as an XML element with the key name however the
"xmlele_" is dropped from the name.

if else:

value is added as an XML element with the key name.

closes #331.

Files:

• trunk/lib/soap/baseData.rb (modified) (3 diffs)
• trunk/lib/soap/soap.rb (modified) (1 diff)
• trunk/test/soap/test_soapelement.rb (modified) (1 diff)

trunk/lib/soap/baseData.rb

@@ -686 +686 @@
-  end
-
+  # when obj is a Hash or an Array:
+  #   when key starts with "xmlattr_":
+  #     value is added as an XML attribute with the key name however the
+  #     "xmlattr_" is dropped from the name.
+  #   when key starts with "xmlele_":
+  #     value is added as an XML element with the key name however the
+  #     "xmlele_" is dropped from the name.
+  #   if else:
+  #     value is added as an XML element with the key name.
-  def self.from_obj(obj, namespace = nil)
-    o = SOAPElement.new(nil)
@@ -692 +701 @@
-      o.text = nil
-    when Hash, Array
-
+
+
-        if value.is_a?(Array)
-          value.each do |subvalue|
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            o.add(child)
-          end
-        else
-          child = from_obj(value, namespace)
-          child.elename = to_elename(elename, namespace)
-          o.add(child)
-        end
-      end
@@ -711 +729 @@
-  end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if obj.is_a?(XSD::QName)
-      obj

trunk/lib/soap/soap.rb

@@ -14 +14 @@
-
-
--SNAPSHOT
+
-PropertyName = 'soap/property'
-

trunk/test/soap/test_soapelement.rb

@@ -115 +115 @@
-    assert_equal(nil, SOAPElement.from_obj(source).to_obj)
-  end
+
+  def test_from_obj_xmlattr
+    source = { "xmlattr_c1" => "t1",
+      "ymlattr_c2" => {
+        XSD::QName.new("urn:foo", "xmlattr_c2") => "t2",
+        XSD::QName.new("urn:foo", "ymlattr_c3") => "t3" }}
+    obj = SOAPElement.from_obj(source)
+    assert_equal("t1", obj.extraattr[XSD::QName.new(nil, "c1")])
+    assert_equal("t2", obj["ymlattr_c2"].extraattr[XSD::QName.new("urn:foo", "c2")])
+    assert_equal("t3", obj["ymlattr_c2"]["ymlattr_c3"].text)
+    #
+    source = { "xmlattr_xmlattr_c1" => "t1",
+      "xmlele_xmlattr_c2" => {
+        XSD::QName.new("urn:foo", "xmlele_xmlele_c3") => "t3" }}
+    obj = SOAPElement.from_obj(source)
+    assert_equal("t1", obj.extraattr[XSD::QName.new(nil, "xmlattr_c1")])
+    assert_equal("t3", obj["xmlattr_c2"]["xmlele_c3"].text)
+  end
-end
-