soap4r 1.5.6 → 1.5.7

data/bin/wsdl2ruby.rb

@@ -13,7 +13,7 @@ private
     ['--module_path','-m', GetoptLong::REQUIRED_ARGUMENT],
     ['--type','-t', GetoptLong::REQUIRED_ARGUMENT],
     ['--classdef','-e', GetoptLong::OPTIONAL_ARGUMENT],
-    ['--mapping_registry','-r', GetoptLong::OPTIONAL_ARGUMENT],
+    ['--mapping_registry','-r', GetoptLong::NO_ARGUMENT],
     ['--client_skelton','-c', GetoptLong::OPTIONAL_ARGUMENT],
     ['--servant_skelton','-s', GetoptLong::OPTIONAL_ARGUMENT],
     ['--cgi_stub','-g', GetoptLong::OPTIONAL_ARGUMENT],

data/bin/xsd2ruby.rb

@@ -10,7 +10,10 @@ private
 
   OptSet = [
     ['--xsd','-x', GetoptLong::REQUIRED_ARGUMENT],
-    ['--classname','-n', GetoptLong::NO_ARGUMENT],
+    ['--module_path','-m', GetoptLong::REQUIRED_ARGUMENT],
+    ['--classdef','-e', GetoptLong::OPTIONAL_ARGUMENT],
+    ['--mapping_registry','-r', GetoptLong::NO_ARGUMENT],
+    ['--mapper','-p', GetoptLong::NO_ARGUMENT],
     ['--force','-f', GetoptLong::NO_ARGUMENT],
     ['--quiet','-q', GetoptLong::NO_ARGUMENT],
   ]
@@ -43,11 +46,14 @@ Usage: #{ $0 } --xsd xsd_location [options]
   xsd_location: filename or URL
 
 Example:
-  #{ $0 } --xsd myapp.xsd --classname Foo
+  #{ $0 } --xsd myapp.xsd --classdef foo
 
 Options:
   --xsd xsd_location
-  --classname classname
+  --classdef [filenameprefix]
+  --mapping_registry
+  --mapper
+  --module_path [Module::Path::Name]
   --force
   --quiet
 __EOU__
@@ -62,7 +68,9 @@ __EOU__
        	case name
 	when "--xsd"
 	  xsd = arg
-	when "--classname"
+        when "--module_path"
+          opt['module_path'] = arg
+	when "--classdef", "--mapping_registry", "--mapper"
   	  opt[name.sub(/^--/, '')] = arg.empty? ? nil : arg
 	when "--force"
 	  opt['force'] = true

data/lib/soap/baseData.rb

@@ -580,7 +580,9 @@ class SOAPElement
 
   def initialize(elename, text = nil)
     super()
-    if !elename.is_a?(XSD::QName)
+    if elename.nil?
+      elename = XSD::QName::EMPTY
+    elsif !elename.is_a?(XSD::QName)
       elename = XSD::QName.new(nil, elename)
     end
     @encodingstyle = LiteralNamespace

data/lib/soap/encodingstyle/literalHandler.rb

@@ -32,13 +32,14 @@ class LiteralHandler < Handler
     data.extraattr.each do |key, value|
       next if !@generate_explicit_type and key == XSD::AttrTypeName
       # ToDo: check generator.attributeformdefault here
+      keytag = key
       if key.is_a?(XSD::QName)
-        key = encode_qname(attrs, ns, key)
+        keytag = encode_qname(attrs, ns, key)
       end
       if value.is_a?(XSD::QName)
         value = encode_qname(attrs, ns, value)
       end
-      attrs[key] = value
+      attrs[keytag] = value
     end
     case data
     when SOAPExternalReference

data/lib/soap/encodingstyle/soapHandler.rb

@@ -297,12 +297,17 @@ private
 	attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
       end
     end
-
     data.extraattr.each do |key, value|
+      keytag = key
       if key.is_a?(XSD::QName)
         keytag = encode_qname(attrs, ns, key)
       end
-      attrs[keytag] = encode_attr_value(generator, ns, key, value)
+      if value.is_a?(XSD::QName)
+        value = encode_qname(attrs, ns, value)
+      else
+        value = encode_attr_value(generator, ns, key, value)
+      end
+      attrs[keytag] = value
     end
     if data.id
       attrs['id'] = data.id
@@ -316,8 +321,6 @@ private
       ref = SOAPReference.new(value)
       generator.add_reftarget(qname.name, value)
       ref.refidstr
-    when XSD::QName
-      encode_qname(attrs, ns, value)
     else
       value.to_s
     end

data/lib/soap/filter.rb

@@ -1,4 +1,4 @@
-# SOAP4R - SOAP envelope filter.
+# SOAP4R - SOAP filter.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
 # This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
@@ -7,4 +7,7 @@
 
 
 require 'soap/filter/filterchain'
+# envelope filter
 require 'soap/filter/handler'
+# steram filter
+require 'soap/filter/streamhandler'

data/lib/soap/filter/filterchain.rb

@@ -1,4 +1,4 @@
-# SOAP4R - SOAP envelope filter handler.
+# SOAP4R - SOAP filter chain.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
 # This program is copyrighted free software by NAKAMURA, Hiroshi.  You can

data/lib/soap/filter/streamhandler.rb

@@ -0,0 +1,29 @@
+# SOAP4R - SOAP stream filter base class.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+module Filter
+
+
+class StreamHandler
+
+  # no returning value expected.
+  def on_http_outbound(req)
+    # do something.
+  end
+
+  # no returning value expected.
+  def on_http_inbound(req, res)
+    # do something.
+  end
+
+end
+
+
+end
+end

data/lib/soap/generator.rb

@@ -46,6 +46,7 @@ public
     @use_numeric_character_reference = opt[:use_numeric_character_reference]
     @indentstr = opt[:no_indent] ? '' : '  '
     @buf = @indent = @curr = nil
+    @default_ns = opt[:default_ns]
   end
 
   def generate(obj, io = nil)
@@ -58,6 +59,11 @@ public
     end
 
     ns = XSD::NS.new
+    if @default_ns
+      @default_ns.each_ns do |default_ns, default_tag|
+        SOAPGenerator.assign_ns(obj.extraattr, ns, default_ns, default_tag)
+      end
+    end
     @buf << xmldecl
     encode_data(ns, obj, nil)
 

data/lib/soap/httpconfigloader.rb

@@ -40,6 +40,11 @@ module_function
     basic_auth.add_hook do |key, value|
       set_basic_auth(client, basic_auth)
     end
+    auth = options["auth"] ||= ::SOAP::Property.new
+    set_auth(client, auth)
+    auth.add_hook do |key, value|
+      set_auth(client, auth)
+    end
     options.add_hook("connect_timeout") do |key, value|
       client.connect_timeout = value
     end
@@ -53,13 +58,23 @@ module_function
 
   def set_basic_auth(client, basic_auth)
     basic_auth.values.each do |ele|
-      if ele.is_a?(::Array)
-        url, userid, passwd = ele
-      else
-        url, userid, passwd = ele[:url], ele[:userid], ele[:password]
-      end
-      client.set_basic_auth(url, userid, passwd)
+      client.set_basic_auth(*authele_to_triplets(ele))
+    end
+  end
+
+  def set_auth(client, auth)
+    auth.values.each do |ele|
+      client.set_auth(*authele_to_triplets(ele))
+    end
+  end
+
+  def authele_to_triplets(ele)
+    if ele.is_a?(::Array)
+      url, userid, passwd = ele
+    else
+      url, userid, passwd = ele[:url], ele[:userid], ele[:password]
     end
+    return url, userid, passwd
   end
 
   def set_ssl_config(client, ssl_config)

data/lib/soap/mapping/encodedregistry.rb

@@ -433,7 +433,7 @@ private
     when ::Array
       array2soap(obj, definition)
     else
-      return unknownstubobj2soap(obj, definition)
+      unknownstubobj2soap(obj, definition)
     end
   end
 
@@ -453,6 +453,7 @@ private
     if definition.elements.size == 0
       ele = Mapping.obj2soap(obj)
       ele.elename = definition.elename if definition.elename
+      ele.extraattr[XSD::AttrTypeName] = definition.type if definition.type
       return ele
     else
       ele = SOAPStruct.new(definition.type)

data/lib/soap/mapping/literalregistry.rb

@@ -29,12 +29,12 @@ class LiteralRegistry
     @excn_handler_soap2obj = nil
   end
 
-  def obj2soap(obj, qname)
+  def obj2soap(obj, qname, obj_class = nil)
     soap_obj = nil
     if obj.is_a?(SOAPElement)
       soap_obj = obj
     else
-      soap_obj = any2soap(obj, qname)
+      soap_obj = any2soap(obj, qname, obj_class)
     end
     return soap_obj if soap_obj
     if @excn_handler_obj2soap
@@ -67,20 +67,32 @@ private
 
   MAPPING_OPT = { :no_reference => true }
 
-  def any2soap(obj, qname)
+  def definedobj2soap(obj, definition)
+    obj2soap(obj, definition.elename, definition.mapped_class)
+  end
+
+  def any2soap(obj, qname, obj_class)
     ele = nil
     if obj.is_a?(SOAP::Mapping::Object)
-      ele = mappingobj2soap(obj, qname)
-    elsif definition = schema_definition_from_class(obj.class)
-      # search with class first.  obj can be an instance of a subclass of
-      # defined class.
-      ele = stubobj2soap(obj, qname, definition)
-    elsif definition = schema_definition_from_elename(qname)
-      ele = stubobj2soap(obj, qname, definition)
-    else
-      ele = anyobj2soap(obj, qname)
+      return mappingobj2soap(obj, qname)
     end
-    ele
+    class_definition = schema_definition_from_class(obj_class || obj.class)
+    elename_definition = schema_definition_from_elename(qname)
+    if !class_definition and !elename_definition
+      # no definition found
+      return anyobj2soap(obj, qname)
+    end
+    if !class_definition or !elename_definition
+      # use found one
+      return stubobj2soap(obj, qname, class_definition || elename_definition)
+    end
+    # found both:
+    if class_definition.class_for == elename_definition.class_for
+      # if two definitions are for the same class, give qname a priority.
+      return stubobj2soap(obj, qname, elename_definition)
+    end
+    # it should be a derived class
+    return stubobj2soap(obj, qname, class_definition)
   end
 
   def anyobj2soap(obj, qname)
@@ -119,6 +131,9 @@ private
     if definition.type
       ele.extraattr[XSD::AttrTypeName] = definition.type
     end
+    if qname.nil? and definition.elename
+      ele.elename = definition.elename
+    end
     stubobj2soap_elements(obj, ele, definition.elements)
     if definition.attributes
       definition.attributes.each do |qname, param|
@@ -151,7 +166,7 @@ private
         end
       elsif obj.respond_to?(:each) and definition.as_array?
         obj.each do |item|
-          ele.add(obj2soap(item, definition.elename))
+          ele.add(definedobj2soap(item, definition))
         end
       else
         child = Mapping.get_attribute(obj, definition.varname)
@@ -160,10 +175,10 @@ private
         else
           if child.respond_to?(:each) and definition.as_array?
             child.each do |item|
-              ele.add(obj2soap(item, definition.elename))
+              ele.add(definedobj2soap(item, definition))
             end
           else
-            ele.add(obj2soap(child, definition.elename))
+            ele.add(definedobj2soap(child, definition))
           end
         end
       end

data/lib/soap/mapping/registry.rb

@@ -185,7 +185,10 @@ module RegistrySupport
   def register(definition)
     obj_class = definition[:class]
     definition = Mapping.create_schema_definition(obj_class, definition)
-    @class_schema_definition[obj_class] = definition
+    # give complexType definition a priority explicitly
+    if !@class_schema_definition[obj_class] or definition.type
+      @class_schema_definition[obj_class] = definition
+    end
     if definition.elename
       @elename_schema_definition[definition.elename] = definition
     end
@@ -237,6 +240,7 @@ module RegistrySupport
   end
 
   def base2soap(obj, type, qualified = nil)
+    return SOAPNil.new if obj.nil?
     soap_obj = nil
     if type <= XSD::XSDString
       str = XSD::Charset.encoding_conv(obj.to_s,

data/lib/soap/mapping/rubytypeFactory.rb

@@ -420,6 +420,9 @@ private
     end
     typestr = Mapping.elename2name(node.type.name)
     klass = Mapping.class_from_name(typestr)
+    if klass.respond_to?(:soap_marshallable) and !klass.soap_marshallable
+      return nil
+    end
     if klass.nil? and @allow_untyped_struct
       klass = Mapping.class_from_name(typestr, true)    # lenient
     end

data/lib/soap/mapping/wsdlliteralregistry.rb

@@ -29,7 +29,7 @@ class WSDLLiteralRegistry < LiteralRegistry
     @definedelements = definedelements
   end
 
-  def obj2soap(obj, qname)
+  def obj2soap(obj, qname, obj_class = nil)
     soap_obj = nil
     if obj.is_a?(SOAPElement)
       soap_obj = obj
@@ -38,7 +38,7 @@ class WSDLLiteralRegistry < LiteralRegistry
     elsif type = @definedtypes[qname]
       soap_obj = obj2typesoap(obj, type)
     else
-      soap_obj = any2soap(obj, qname)
+      soap_obj = any2soap(obj, qname, obj_class)
     end
     return soap_obj if soap_obj
     if @excn_handler_obj2soap
@@ -54,7 +54,7 @@ class WSDLLiteralRegistry < LiteralRegistry
   def soap2obj(node, obj_class = nil)
     # obj_class is given when rpc/literal service.  but ignored for now.
     begin
-      return any2obj(node)
+      return any2obj(node, obj_class)
     rescue MappingError
     end
     if @excn_handler_soap2obj

data/lib/soap/netHttpClient.rb

@@ -30,12 +30,14 @@ class NetHttpClient
   attr_accessor :send_timeout           # ignored for now.
   attr_accessor :receive_timeout
   attr_reader :test_loopback_response
+  attr_reader :request_filter           # ignored for now.
 
   def initialize(proxy = nil, agent = nil)
     @proxy = proxy ? URI.parse(proxy) : nil
     @agent = agent
     @debug_dev = nil
     @test_loopback_response = []
+    @request_filter = Filter::FilterChain.new
     @session_manager = SessionManager.new
     @no_proxy = @ssl_config = @protocol_version = nil
     @connect_timeout = @send_timeout = @receive_timeout = nil
@@ -59,6 +61,10 @@ class NetHttpClient
     @proxy
   end
 
+  def set_auth(uri, user_id, passwd)
+    raise NotImplementedError.new("auth is not supported under soap4r + net/http.")
+  end
+
   def set_basic_auth(uri, user_id, passwd)
     # net/http does not handle url.
     @basic_auth = [user_id, passwd]

data/lib/soap/rpc/router.rb

@@ -359,22 +359,26 @@ private
     # normal program exception, it is wrapped inside a custom SOAP4R
     # SOAP exception element.
     detail = nil
-    if (wsdl_fault_details)
-      registry = wsdl_fault_details[:use] == "literal" ?
-        @literal_mapping_registry : @mapping_registry
-      faultQName = XSD::QName.new(
-        wsdl_fault_details[:ns], wsdl_fault_details[:name]
-      )
-      detail = Mapping.obj2soap(e, registry, faultQName)
-      # wrap fault element (SOAPFault swallows top-level element)
-      wrapper = SOAP::SOAPElement.new(faultQName)
-      wrapper.add(detail)
-      detail = wrapper
-    else
-      # Exception is a normal program exception. Wrap it.
-      detail = Mapping.obj2soap(Mapping::SOAPException.new(e),
-                                @mapping_registry)
-      detail.elename ||= XSD::QName::EMPTY # for literal mappingregstry
+    begin
+      if (wsdl_fault_details)
+        registry = wsdl_fault_details[:use] == "literal" ?
+          @literal_mapping_registry : @mapping_registry
+        faultQName = XSD::QName.new(
+          wsdl_fault_details[:ns], wsdl_fault_details[:name]
+        )
+        detail = Mapping.obj2soap(e, registry, faultQName)
+        # wrap fault element (SOAPFault swallows top-level element)
+        wrapper = SOAP::SOAPElement.new(faultQName)
+        wrapper.add(detail)
+        detail = wrapper
+      else
+        # Exception is a normal program exception. Wrap it.
+        detail = Mapping.obj2soap(Mapping::SOAPException.new(e),
+                                  @mapping_registry)
+        detail.elename ||= XSD::QName::EMPTY # for literal mappingregstry
+      end
+    rescue
+      detail = SOAPString.new("failed to serialize detail object: #{$!}")
     end
 
     SOAPFault.new(
@@ -473,7 +477,12 @@ private
     def request_rpc(body, mapping_registry, literal_mapping_registry, opt)
       request = body.request
       unless request.is_a?(SOAPStruct)
-        raise RPCRoutingError.new("not an RPC style")
+        if request.is_a?(SOAPNil)
+          # SOAP::Lite/0.69 seems to send xsi:nil="true" element as a request.
+          request = SOAPStruct.new(request.elename)
+        else
+          raise RPCRoutingError.new("not an RPC style")
+        end
       end
       if @request_use == :encoded
         request_rpc_enc(request, mapping_registry, opt)