Changeset 1665

Timestamp:

11/08/05 23:57:33 (3 years ago)

Author:

nahi

Message:

allow user to set own streamhandler.

client.optionsprotocol.streamhandler? = factory

factory.create(options) is called for creating streamhandler. for more detail, see lib/soap/streamHandler.rb and test/soap/test_streamhandler.rb. closes #180.

Files:

• trunk/lib/soap/rpc/proxy.rb (modified) (2 diffs)
• trunk/lib/soap/streamHandler.rb (modified) (3 diffs)
• trunk/lib/wsdl/xmlSchema/complexExtension.rb (modified) (1 diff)
• trunk/sample/wsdl/PayPalSvc (added)
• trunk/sample/wsdl/PayPalSvc/client.rb (added)
• trunk/test/soap/test_streamhandler.rb (modified) (1 diff)

trunk/lib/soap/rpc/proxy.rb

@@ -42 +42 @@
-    @soapaction = soapaction
-    @options = options
-streamhandler = HTTPStreamHandler.new(
-  @options["protocol.http"] ||= ::SOAP::Property.new
+protocol_option = options["protocol"] ||= ::SOAP::Property.new
+initialize_streamhandler(@protocol_option
-    @operation = {}
-    @mandatorycharset = nil
@@ -184 +184 @@
-private
-
+  def initialize_streamhandler(options)
+    value = options["streamhandler"]
+    if value and !value.empty?
+      factory = Property::Util.const_from_name(value)
+    else
+      factory = HTTPStreamHandler
+    end
+    @streamhandler = factory.create(options)
+    options.add_hook("streamhandler") do |key, value|
+      @streamhandler.reset
+      if value.respond_to?(:create)
+        factory = value
+      elsif value and !value.to_str.empty?
+        factory = Property::Util.const_from_name(value.to_str)
+      else
+        factory = HTTPStreamHandler
+      end
+      options.unlock(true)
+      @streamhandler = factory.create(options)
+    end
+  end
+
-  def set_envelopenamespace(env, namespace)
-    env.elename = XSD::QName.new(namespace, env.elename.name)

trunk/lib/soap/streamHandler.rb

@@ -53 +53 @@
-    "#{ MediaType }; charset=#{ charset }"
-  end
+
+  def send(endpoint_url, conn_data, soapaction = nil, charset = nil)
+    # send a ConnectionData to specified endpoint_url.
+    # return value is a ConnectionData with receive_* property filled.
+    # You can fill values of given conn_data and return it.
+  end
+
+  def reset(endpoint_url = nil)
+    # for initializing connection status if needed.
+    # return value is not expected.
+  end
+
+  def set_wiredump_file_base(wiredump_file_base)
+    # for logging.  return value is not expected.
+    # Override it when you want.
+    raise NotImplementedError
+  end
+
+  def test_loopback_response
+    # for loopback testing.  see HTTPStreamHandler for more detail.
+    # return value is an Array of loopback responses.
+    # Override it when you want.
+    raise NotImplementedError
+  end
-end
-
@@ -80 +104 @@
-  
-  MAX_RETRY_COUNT = 10          # [times]
+
+  def self.create(options)
+    new(options)
+  end
-
-  def initialize(options)
@@ -122 +150 @@
-
-  def set_options
-
-
-
+
+
+
+
-      @charset = value
-    end
-
-
+http.
+http.
-      @wiredump_dev = value
-      @client.debug_dev = @wiredump_dev
-    end
-
-
+http.
+http.
-      set_cookie_store_file(value)
-    end
-
-
-
+http.
+http.
+["http"]
-    ssl_config.unlock
-    basic_auth.unlock

trunk/lib/wsdl/xmlSchema/complexExtension.rb

@@ -88 +88 @@
-  def basetype
-    @basetype ||= root.collect_complextypes[@base]
+    unless @basetype
+      RuntimeError.new("base type definition not found: #{@base}")
+    end
+    @basetype
-  end
-end

trunk/test/soap/test_streamhandler.rb

@@ -204 +204 @@
-    assert_equal("text/xml; charset=iso-8859-3", h["content-type"])
-  end
+
+  def test_custom_streamhandler
+    @client.options["protocol.streamhandler"] = MyStreamHandler
+    assert_equal("hello", @client.do_server_proc)
+    @client.options["protocol.streamhandler"] = ::SOAP::HTTPStreamHandler
+    assert_nil(@client.do_server_proc)
+    @client.options["protocol.streamhandler"] = MyStreamHandler
+    assert_equal("hello", @client.do_server_proc)
+    @client.options["protocol.streamhandler"] = ::SOAP::HTTPStreamHandler
+    assert_nil(@client.do_server_proc)
+  end
+
+  class MyStreamHandler < SOAP::StreamHandler
+    def self.create(options)
+      new
+    end
+
+    def send(endpoint_url, conn_data, soapaction = nil, charset = nil)
+      conn_data.receive_string = %q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:do_server_proc xmlns:n1="urn:foo" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return xsi:type="xsd:string">hello</return>
+    </n1:do_server_proc>
+  </env:Body>
+</env:Envelope>]
+      conn_data
+    end
+
+    def reset(endpoint_url = nil)
+      # nothing to do
+    end
+  end
-end
-