Changeset 1779

Timestamp:

05/17/07 10:47:54 (1 year ago)

Author:

nahi

Message:

• allow to send XML. pass a REXML::Element(includes REXML::Document) or an object which responds to to_xml to get serialized XML. closes #21.
  

Files:

• trunk/lib/soap/baseData.rb (modified) (1 diff)
• trunk/lib/soap/generator.rb (modified) (1 diff)
• trunk/lib/soap/mapping/mapping.rb (modified) (1 diff)
• trunk/test/soap/asp.net/test_aspdotnet.rb (modified) (1 diff)
• trunk/test/wsdl/document/test_rpc.rb (modified) (1 diff)

trunk/lib/soap/baseData.rb

@@ -765 +765 @@
-
-
+class SOAPRawData < SOAPElement
+  def initialize(obj)
+    super(XSD::QName::EMPTY)
+    @obj = obj
+  end
+
+  def to_xml
+    @obj.to_xml
+  end
+end
+
+
-class SOAPArray < XSD::NSDBase
-  include SOAPCompoundtype

trunk/lib/soap/generator.rb

@@ -69 +69 @@
-
-  def encode_data(ns, obj, parent)
-
+
+
+
+
-      encode_element(ns, obj, parent)
-      return

trunk/lib/soap/mapping/mapping.rb

@@ -119 +119 @@
-  end
-
+  class REXMLElementWrap
+    def initialize(ele)
+      @ele = ele
+    end
+
+    def to_xml
+      @ele.to_s
+    end
+  end
+
-  def self._obj2soap(obj, registry, type = nil)
-
+
+
+
+
+
-        !Thread.current[:SOAPMapping][:NoReference]
-      SOAPReference.new(referent)

trunk/test/soap/asp.net/test_aspdotnet.rb

@@ -69 +69 @@
-  end
-
+  def test_xml
+    @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.add_document_method('sayHello', Server::Namespace + 'SayHello',
+      XSD::QName.new(Server::Namespace, 'SayHello'),
+      XSD::QName.new(Server::Namespace, 'SayHelloResponse'))
+    require 'rexml/document'
+    xml = <<__XML__
+<n1:sayHello xmlns:n1="http://localhost/WebService/">
+  <n1:name>Mike</n1:name>
+</n1:sayHello>
+__XML__
+    ele = REXML::Document.new(xml)
+    assert_equal("Hello Mike", @client.sayHello(ele))
+    def xml.to_xml; to_s; end
+    assert_equal("Hello Mike", @client.sayHello(xml))
+  end
+
-  def test_aspdotnethandler
-    @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)

trunk/test/wsdl/document/test_rpc.rb

@@ -218 +218 @@
-  end
-
+  def test_to_xml
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
+    @client.add_document_method('echo', 'urn:docrpc:echo',
+      XSD::QName.new('urn:docrpc', 'echoele'),
+      XSD::QName.new('urn:docrpc', 'echo_response'))
+    @client.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    require 'rexml/document'
+    echo = REXML::Document.new(<<__XML__.chomp)
+<foo attr-int="5" attr_string="attr_string">
+  <struct1 m_attr="myattr1">
+    <m_string>mystring1</m_string>
+    <m_datetime>2005-03-17T19:47:31+01:00</m_datetime>
+  </struct1>
+  <struct-2 m_attr="myattr2">
+    <m_string>mystring2</m_string>
+    <m_datetime>2005-03-17T19:47:32+02:00</m_datetime>
+  </struct-2>
+</foo>
+__XML__
+    ret = @client.echo(echo)
+    timeformat = "%Y-%m-%dT%H:%M:%S"
+    assert_equal('mystring2', ret.struct1.m_string)
+    assert_equal('2005-03-17T19:47:32',
+      ret.struct1.m_datetime.strftime(timeformat))
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal('2005-03-17T19:47:31',
+      ret.struct_2.m_datetime.strftime(timeformat))
+    assert_equal('attr_string', ret.xmlattr_attr_string)
+    assert_equal(5, ret.xmlattr_attr_int)
+    #
+    echoele = REXML::Document.new(<<__XML__.chomp)
+<n1:echoele xmlns:n1="urn:docrpc">
+  <struct-2>
+    <m_datetime>2005-03-17T19:47:32+02:00</m_datetime>
+    <m_string>mystring2</m_string>
+  </struct-2>
+  <struct1>
+    <m_datetime>2005-03-17T19:47:31+01:00</m_datetime>
+    <m_string>mystring1</m_string>
+  </struct1>
+</n1:echoele>
+__XML__
+    ret = @client.echo(echoele)
+    timeformat = "%Y-%m-%dT%H:%M:%S"
+    assert_equal('mystring2', ret.struct1.m_string)
+    assert_equal('2005-03-17T19:47:32',
+      ret.struct1.m_datetime.strftime(timeformat))
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal('2005-03-17T19:47:31',
+      ret.struct_2.m_datetime.strftime(timeformat))
+  end
+
-  def test_nil
-    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")