Changeset 1570

Timestamp:

07/13/05 23:16:21 (3 years ago)

Author:

nahi

Message:

Let envelope namespace configuable. usage;

TemporaryNamespace? = 'http://www.w3.org/2003/05/soap-envelope'
@client.optionssoap.envelope.requestnamespace? = TemporaryNamespace?
@client.optionssoap.envelope.responsenamespace? = TemporaryNamespace?
@client.do_proc(...)

closes #124.

Files:

• trunk/lib/soap/element.rb (modified) (1 diff)
• trunk/lib/soap/parser.rb (modified) (4 diffs)
• trunk/lib/soap/rpc/proxy.rb (modified) (4 diffs)
• trunk/lib/soap/soap.rb (modified) (1 diff)

trunk/lib/soap/element.rb

@@ -240 +240 @@
-
-  def encode(generator, ns, attrs = {})
-EnvelopeN
+elename.n
-    name = ns.name(@elename)
-    generator.encode_tag(name, attrs)

trunk/lib/soap/parser.rb

@@ -61 +61 @@
-public
-
+  attr_accessor :envelopenamespace
-  attr_accessor :default_encodingstyle
-  attr_accessor :decode_typemap
@@ -71 +72 @@
-    @lastnode = nil
-    @handlers = {}
+    @envelopenamespace = opt[:envelopenamespace] || EnvelopeNamespace
-    @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
-    @decode_typemap = opt[:decode_typemap] || nil
@@ -158 +160 @@
-  def find_encodingstyle(ns, attrs)
-    attrs.each do |key, value|
-EnvelopeN
+@envelopen
-        return value
-      end
@@ -169 +171 @@
-
-    # Envelope based parsing.
-EnvelopeN
+@envelopen
-        (@allow_unqualified_element && ele.namespace.nil?))
-      o = decode_soap_envelope(ns, ele, attrs, parent)

trunk/lib/soap/rpc/proxy.rb

@@ -116 +116 @@
-    reqopt = create_options({
-      :soapaction => op_info.soapaction || @soapaction,
+      :envelopenamespace => @options["soap.envelope.requestnamespace"],
-      :default_encodingstyle => op_info.request_default_encodingstyle})
-    resopt = create_options({
+      :envelopenamespace => @options["soap.envelope.responsenamespace"],
-      :default_encodingstyle => op_info.response_default_encodingstyle})
-    env = route(req_header, req_body, reqopt, resopt)
@@ -131 +133 @@
-
-  def route(req_header, req_body, reqopt, resopt)
-
+
+
+
+
-    reqopt[:external_content] = nil
-    conn_data = marshal(req_env, reqopt)
@@ -159 +164 @@
-
-private
+
+  def set_envelopenamespace(env, namespace)
+    env.elename.namespace = namespace
+    env.header.elename.namespace = namespace if env.header
+    env.body.elename.namespace = namespace if env.body
+  end
-
-  def create_request_header
@@ -201 +212 @@
-        ::SOAP::StreamHandler.parse_media_type(contenttype)
-      env = Processor.unmarshal(conn_data.receive_string, opt)
+    end
+    unless env.is_a?(::SOAP::SOAPEnvelope)
+      raise ResponseFormatError.new(
+        "response is not a SOAP envelope: #{conn_data.receive_string}")
-    end
-    env

trunk/lib/soap/soap.rb

@@ -77 +77 @@
-class RPCRoutingError < Error; end
-class EmptyResponseError < Error; end
+class ResponseFormatError < Error; end
-
-class UnhandledMustUnderstandHeaderError < Error; end