* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.

	  == SOAP client and server ==

	  === for both client side and server side ===

	  * improved document/literal service support.
	    style(rpc,document)/use(encoding, literal) combination are all
	    supported.  for the detail about combination, see
	    test/soap/test_style.rb.

	  * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
	    WSDL as well as obj2soap.  closes #70.

	  * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
	    you can set/get XML attribute via accessor methods which as a name
	    'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).

	  === client side ===

	  * WSDLDriver capitalized name operation bug fixed.  from
	    1.5.3-ruby1.8.2, operation which has capitalized name (such as
	    KeywordSearchRequest in AWS) is defined as a method having
	    uncapitalized name. (converted with GenSupport.safemethodname
	    to handle operation name 'foo-bar').  it introduced serious
	    incompatibility; in the past, it was defined as a capitalized.
	    define capitalized method as well under that circumstance.

	  * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
	    to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
	    are merged).  'WSDLDriverFactory#create_driver' still creates
	    WSDLDriver for compatibility but it warns that the method is
	    deprecated.  please use create_rpc_driver instead of create_driver.

	  * allow to use an URI object as an endpoint_url even with net/http,
	    not http-access2.

	  === server side ===

	  * added mod_ruby support to SOAP::CGIStub.  rename a CGI script
	    server.cgi to server.rb and let mod_ruby's RubyHandler handles the
	    script.  CGIStub detects if it's running under mod_ruby environment
	    or not.

	  * added fcgi support to SOAP::CGIStub.  see the sample at
	    sample/soap/calc/server.fcgi.  (almost same as server.cgi but has
	    fcgi handler at the bottom.)

	  * allow to return a SOAPFault object to respond customized SOAP fault.

	  * added the interface 'generate_explicit_type' for server side
	    (CGIStub, HTTPServer).  call 'self.generate_explicit_type = true'
	    if you want to return simplified XML even if it's rpc/encoded
	    service.

	  == WSDL ==

	  === WSDL definition ===

	  * improved XML Schema support such as extension, restriction,
	    simpleType, complexType + simpleContent, ref, length, import,
	    include.

	  * reduced "unknown element/attribute" warnings (warn only 1 time for
	    each QName).

	  * importing XSD file at schemaLocation with xsd:import.

	  === code generation from WSDL ===

	  * generator crashed when there's '-' in defined element/attribute
	    name.

	  * added ApacheMap WSDL definition.

	* sample/{soap,wsdl}: removed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 22 insertions, 15 deletions

diff --git a/lib/wsdl/soap/complexType.rb b/lib/wsdl/soap/complexType.rb
index 1bed059f7e..bba50fd153 100644
--- a/lib/wsdl/soap/complexType.rb
+++ b/lib/wsdl/soap/complexType.rb
@@ -31,42 +31,44 @@ class ComplexType < Info
       else
 	:TYPE_STRUCT
       end
-    elsif complexcontent and complexcontent.base == ::SOAP::ValueArrayName
-      :TYPE_ARRAY
+    elsif complexcontent
+      if complexcontent.base == ::SOAP::ValueArrayName
+        :TYPE_ARRAY
+      else
+        complexcontent.basetype.check_type
+      end
     elsif simplecontent
       :TYPE_SIMPLE
     elsif !attributes.empty?
       :TYPE_STRUCT
-    else
-      raise NotImplementedError.new("Unknown kind of complexType.")
+    else # empty complexType definition (seen in partner.wsdl of salesforce)
+      :TYPE_EMPTY
     end
   end
 
   def child_type(name = nil)
-    type = nil
     case compoundtype
     when :TYPE_STRUCT
       if ele = find_element(name)
-        type = ele.type
+        ele.type
       elsif ele = find_element_by_name(name.name)
-	type = ele.type
+	ele.type
       end
     when :TYPE_ARRAY
-      type = @contenttype ||= content_arytype
+      @contenttype ||= content_arytype
     when :TYPE_MAP
       item_ele = find_element_by_name("item") or
         raise RuntimeError.new("'item' element not found in Map definition.")
       content = item_ele.local_complextype or
         raise RuntimeError.new("No complexType definition for 'item'.")
       if ele = content.find_element(name)
-        type = ele.type
+        ele.type
       elsif ele = content.find_element_by_name(name.name)
-        type = ele.type
+        ele.type
       end
     else
       raise NotImplementedError.new("Unknown kind of complexType.")
     end
-    type
   end
 
   def child_defined_complextype(name)
@@ -103,16 +105,21 @@ class ComplexType < Info
 	  return attribute.arytype
 	end
       end
-    elsif content.elements.size == 1 and content.elements[0].maxoccurs != '1'
+      if check_array_content(complexcontent.content)
+        return complexcontent.content.elements[0].type
+      end
+    elsif check_array_content(content)
       return content.elements[0].type
-    else
-      raise RuntimeError.new("Assert: Unknown array definition.")
     end
-    nil
+    raise RuntimeError.new("Assert: Unknown array definition.")
   end
 
 private
 
+  def check_array_content(content)
+    content.elements.size == 1 and content.elements[0].maxoccurs != '1'
+  end
+
   def content_arytype
     if arytype = find_arytype
       ns = arytype.namespace