* added files

          * lib/soap/attachment.rb
          * lib/soap/header
          * lib/soap/mimemessage.rb
          * lib/soap/rpc/httpserver.rb
          * lib/wsdl/soap/cgiStubCreator.rb
          * lib/wsdl/soap/classDefCreator.rb
          * lib/wsdl/soap/classDefCreatorSupport.rb
          * lib/wsdl/soap/clientSkeltonCreator.rb
          * lib/wsdl/soap/driverCreator.rb
          * lib/wsdl/soap/mappingRegistryCreator.rb
          * lib/wsdl/soap/methodDefCreator.rb
          * lib/wsdl/soap/servantSkeltonCreator.rb
          * lib/wsdl/soap/standaloneServerStubCreator.rb
          * lib/wsdl/xmlSchema/enumeration.rb
          * lib/wsdl/xmlSchema/simpleRestriction.rb
          * lib/wsdl/xmlSchema/simpleType.rb
          * lib/xsd/codegen
          * lib/xsd/codegen.rb
          * sample/soap/authheader
          * sample/soap/raa2.4
          * sample/soap/ssl
          * sample/soap/swa
          * sample/soap/whois.rb
          * sample/soap/calc/samplehttpd.conf
          * sample/soap/exchange/samplehttpd.conf
          * sample/soap/sampleStruct/samplehttpd.conf
          * sample/wsdl/raa2.4
          * sample/wsdl/googleSearch/samplehttpd.conf
          * test/openssl/_test_ssl.rb
          * test/soap/header
          * test/soap/ssl
          * test/soap/struct
          * test/soap/swa
          * test/soap/wsdlDriver
          * test/wsdl/multiplefault.wsdl
          * test/wsdl/simpletype
          * test/wsdl/test_multiplefault.rb

        * modified files
          * lib/soap/baseData.rb
          * lib/soap/element.rb
          * lib/soap/generator.rb
          * lib/soap/marshal.rb
          * lib/soap/netHttpClient.rb
          * lib/soap/parser.rb
          * lib/soap/processor.rb
          * lib/soap/property.rb
          * lib/soap/soap.rb
          * lib/soap/streamHandler.rb
          * lib/soap/wsdlDriver.rb
          * lib/soap/encodingstyle/handler.rb
          * lib/soap/encodingstyle/literalHandler.rb
          * lib/soap/encodingstyle/soapHandler.rb
          * lib/soap/mapping/factory.rb
          * lib/soap/mapping/mapping.rb
          * lib/soap/mapping/registry.rb
          * lib/soap/mapping/rubytypeFactory.rb
          * lib/soap/mapping/wsdlRegistry.rb
          * lib/soap/rpc/cgistub.rb
          * lib/soap/rpc/driver.rb
          * lib/soap/rpc/element.rb
          * lib/soap/rpc/proxy.rb
          * lib/soap/rpc/router.rb
          * lib/soap/rpc/soaplet.rb
          * lib/soap/rpc/standaloneServer.rb
          * lib/wsdl/data.rb
          * lib/wsdl/definitions.rb
          * lib/wsdl/operation.rb
          * lib/wsdl/parser.rb
          * lib/wsdl/soap/definitions.rb
          * lib/wsdl/xmlSchema/complexContent.rb
          * lib/wsdl/xmlSchema/complexType.rb
          * lib/wsdl/xmlSchema/data.rb
          * lib/wsdl/xmlSchema/parser.rb
          * lib/wsdl/xmlSchema/schema.rb
          * lib/xsd/datatypes.rb
          * lib/xsd/qname.rb
          * sample/soap/calc/httpd.rb
          * sample/soap/exchange/httpd.rb
          * sample/soap/sampleStruct/httpd.rb
          * sample/soap/sampleStruct/server.rb
          * sample/wsdl/amazon/AmazonSearch.rb
          * sample/wsdl/amazon/AmazonSearchDriver.rb
          * sample/wsdl/googleSearch/httpd.rb
          * test/soap/test_basetype.rb
          * test/soap/test_property.rb
          * test/soap/test_streamhandler.rb
          * test/soap/calc/test_calc.rb
          * test/soap/calc/test_calc2.rb
          * test/soap/calc/test_calc_cgi.rb
          * test/soap/helloworld/test_helloworld.rb
          * test/wsdl/test_emptycomplextype.rb
          * test/wsdl/axisArray/test_axisarray.rb
          * test/wsdl/datetime/test_datetime.rb
          * test/wsdl/raa/test_raa.rb
          * test/xsd/test_xmlschemaparser.rb
          * test/xsd/test_xsd.rb

        * summary
          * add SOAP Header mustUnderstand support.

          * add HTTP client SSL configuration and Cookies support (works
            completely with http-access2).

          * add header handler for handling sending/receiving SOAP Header.

          * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
            Model.  it caused error.

          * add WSDL simpleType support to restrict lexical value space.

          * add SOAP with Attachment support.


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

1 files changed, 134 insertions, 48 deletions

diff --git a/lib/soap/wsdlDriver.rb b/lib/soap/wsdlDriver.rb
index d1a1a6cf29..af868ea886 100644
--- a/lib/soap/wsdlDriver.rb
+++ b/lib/soap/wsdlDriver.rb
@@ -12,11 +12,13 @@ require 'xsd/qname'
 require 'soap/element'
 require 'soap/baseData'
 require 'soap/streamHandler'
+require 'soap/mimemessage'
 require 'soap/mapping'
 require 'soap/mapping/wsdlRegistry'
 require 'soap/rpc/rpc'
 require 'soap/rpc/element'
 require 'soap/processor'
+require 'soap/header/handlerset'
 require 'logger'
 
 
@@ -91,6 +93,8 @@ class WSDLDriver
   end
 
   __attr_proxy :options
+  __attr_proxy :headerhandler
+  __attr_proxy :test_loopback_response
   __attr_proxy :endpoint_url, true
   __attr_proxy :mapping_registry, true		# for RPC unmarshal
   __attr_proxy :wsdl_mapping_registry, true	# for RPC marshal
@@ -151,6 +155,7 @@ class WSDLDriver
 
     attr_reader :options
     attr_reader :streamhandler
+    attr_reader :headerhandler
     attr_reader :port
 
     attr_accessor :mapping_registry
@@ -175,7 +180,7 @@ class WSDLDriver
       @mandatorycharset = nil
 
       @wsdl_elements = @wsdl.collect_elements
-      @wsdl_types = @wsdl.collect_complextypes
+      @wsdl_types = @wsdl.collect_complextypes + @wsdl.collect_simpletypes
       @rpc_decode_typemap = @wsdl_types +
 	@wsdl.soap_rpc_complextypes(port.find_binding)
       @wsdl_mapping_registry = Mapping::WSDLRegistry.new(@rpc_decode_typemap)
@@ -183,6 +188,7 @@ class WSDLDriver
       endpoint_url = @port.soap_address.location
       @streamhandler = HTTPPostStreamHandler.new(endpoint_url,
 	@options["protocol.http"] ||= Property.new)
+      @headerhandler = Header::HandlerSet.new
       # Convert a map which key is QName, to a Hash which key is String.
       @operations = {}
       @port.inputoperation_map.each do |op_name, op_info|
@@ -200,14 +206,19 @@ class WSDLDriver
       @streamhandler.reset
     end
 
+    def test_loopback_response
+      @streamhandler.test_loopback_response
+    end
+
     def rpc_send(method_name, *params)
       log(INFO) { "call: calling method '#{ method_name }'." }
       log(DEBUG) { "call: parameters '#{ params.inspect }'." }
 
       op_info = @operations[method_name]
       method = create_method_struct(op_info, params)
-      req_header = nil
+      req_header = call_headers
       req_body = SOAPBody.new(method)
+      req_env = SOAPEnvelope.new(req_header, req_body)
 
       if @wiredump_file_base
 	@streamhandler.wiredump_file_base =
@@ -217,19 +228,20 @@ class WSDLDriver
       begin
 	opt = create_options
 	opt[:decode_typemap] = @rpc_decode_typemap
-	res_header, res_body = invoke(req_header, req_body, op_info, opt)
-	if res_body.fault
-	  raise SOAP::FaultError.new(res_body.fault)
+	res_env = invoke(req_env, op_info, opt)
+	receive_headers(res_env.header)
+	if res_env.body.fault
+	  raise ::SOAP::FaultError.new(res_env.body.fault)
 	end
-      rescue SOAP::FaultError => e
+      rescue ::SOAP::FaultError => e
 	Mapping.fault2exception(e)
       end
 
-      ret = res_body.response ?
-	Mapping.soap2obj(res_body.response, @mapping_registry) : nil
+      ret = res_env.body.response ?
+	Mapping.soap2obj(res_env.body.response, @mapping_registry) : nil
 
-      if res_body.outparams
-	outparams = res_body.outparams.collect { |outparam|
+      if res_env.body.outparams
+	outparams = res_env.body.outparams.collect { |outparam|
   	  Mapping.soap2obj(outparam)
    	}
     	return [ret].concat(outparams)
@@ -245,18 +257,36 @@ class WSDLDriver
       op_info = @operations[name]
       req_header = header_from_obj(header_obj, op_info)
       req_body = body_from_obj(body_obj, op_info)
+      req_env = SOAPEnvelope.new(req_header, req_body)
       opt = create_options
-      res_header, res_body = invoke(req_header, req_body, op_info, opt)
-      if res_body.fault
-	raise SOAP::FaultError.new(res_body.fault)
+      res_env = invoke(req_env, op_info, opt)
+      if res_env.body.fault
+	raise ::SOAP::FaultError.new(res_env.body.fault)
       end
-      res_body_obj = res_body.response ?
-	Mapping.soap2obj(res_body.response, @mapping_registry) : nil
-      return res_header, res_body_obj
+      res_body_obj = res_env.body.response ?
+	Mapping.soap2obj(res_env.body.response, @mapping_registry) : nil
+      return res_env.header, res_body_obj
     end
 
   private
 
+    def call_headers
+      headers = @headerhandler.on_outbound
+      if headers.empty?
+	nil
+      else
+	h = ::SOAP::SOAPHeader.new
+	headers.each do |header|
+	  h.add(header.elename.name, header)
+	end
+	h
+      end
+    end
+
+    def receive_headers(headers)
+      @headerhandler.on_inbound(headers) if headers
+    end
+
     def create_method_struct(op_info, params)
       parts_names = op_info.bodyparts.collect { |part| part.name }
       obj = create_method_obj(parts_names, params)
@@ -283,18 +313,50 @@ class WSDLDriver
       o
     end
 
-    def invoke(req_header, req_body, op_info, opt)
-      send_string = Processor.marshal(req_header, req_body, opt)
+    def invoke(req_env, op_info, opt)
+      opt[:external_content] = nil
+      send_string = Processor.marshal(req_env, opt)
       log(DEBUG) { "invoke: sending string #{ send_string }" }
-      data = @streamhandler.send(send_string, op_info.soapaction)
-      log(DEBUG) { "invoke: received string #{ data.receive_string }" }
-      if data.receive_string.empty?
+      conn_data = StreamHandler::ConnectionData.new(send_string)
+      if ext = opt[:external_content]
+       	mime = MIMEMessage.new
+	ext.each do |k, v|
+	  mime.add_attachment(v.data)
+	end
+	mime.add_part(conn_data.send_string + "\r\n")
+	mime.close
+	conn_data.send_string = mime.content_str
+	conn_data.send_contenttype = mime.headers['content-type'].str
+      end
+      conn_data = @streamhandler.send(conn_data, op_info.soapaction)
+      log(DEBUG) { "invoke: received string #{ conn_data.receive_string }" }
+      if conn_data.receive_string.empty?
 	return nil, nil
       end
-      opt[:charset] = @mandatorycharset ||
-	StreamHandler.parse_media_type(data.receive_contenttype)
-      res_header, res_body = Processor.unmarshal(data.receive_string, opt)
-      return res_header, res_body
+      unmarshal(conn_data, opt)
+    end
+
+    def unmarshal(conn_data, opt)
+      contenttype = conn_data.receive_contenttype
+      if /#{MIMEMessage::MultipartContentType}/i =~ contenttype
+	opt[:external_content] = {}
+	mime = MIMEMessage.parse("Content-Type: " + contenttype,
+	  conn_data.receive_string)
+	mime.parts.each do |part|
+	  value = Attachment.new(part.content)
+	  value.contentid = part.contentid
+	  obj = SOAPAttachment.new(value)
+	  opt[:external_content][value.contentid] = obj if value.contentid
+	end
+	opt[:charset] = @mandatorycharset ||
+	  StreamHandler.parse_media_type(mime.root.headers['content-type'].str)
+	env = Processor.unmarshal(mime.root.content, opt)
+      else
+	opt[:charset] = @mandatorycharset ||
+	::SOAP::StreamHandler.parse_media_type(contenttype)
+	env = Processor.unmarshal(conn_data.receive_string, opt)
+      end
+      env
     end
 
     def header_from_obj(obj, op_info)
@@ -314,9 +376,9 @@ class WSDLDriver
       else
 	header = SOAPHeader.new()
 	op_info.headerparts.each do |part|
-	  child = obj[part.elename.name]
+	  child = Mapper.find_attribute(obj, part.name)
 	  ele = headeritem_from_obj(child, part.element || part.eletype)
-	  header.add(ele)
+	  header.add(part.name, ele)
 	end
 	header
       end
@@ -348,7 +410,7 @@ class WSDLDriver
       else
 	body = SOAPBody.new
 	op_info.bodyparts.each do |part|
-	  child = obj[part.elename.name]
+	  child = Mapper.find_attribute(obj, part.name)
 	  ele = bodyitem_from_obj(child, part.element || part.type)
 	  body.add(ele.elename.name, ele)
 	end
@@ -426,6 +488,7 @@ class WSDLDriver
       opt
     end
 
+    class MappingError < StandardError; end
     class Mapper
       def initialize(elements, types)
 	@elements = elements
@@ -438,7 +501,7 @@ class WSDLDriver
 	elsif type = @types[name]
 	  obj2type(obj, type)
 	else
-	  raise RuntimeError.new("Cannot find name #{name} in schema.")
+	  raise MappingError.new("Cannot find name #{name} in schema.")
 	end
       end
 
@@ -446,6 +509,16 @@ class WSDLDriver
 	raise NotImplementedError.new
       end
 
+      def Mapper.find_attribute(obj, attr_name)
+	if obj.respond_to?(attr_name)
+	  obj.__send__(attr_name)
+	elsif obj.is_a?(Hash)
+	  obj[attr_name] || obj[attr_name.intern]
+	else
+	  obj.instance_eval("@#{ attr_name }")
+	end
+      end
+
     private
 
       def _obj2ele(obj, ele)
@@ -456,25 +529,47 @@ class WSDLDriver
 	  elsif type = TypeMap[ele.type]
 	    o = base2soap(obj, type)
 	  else
-	    raise RuntimeError.new("Cannot find type #{ele.type}.")
+	    raise MappingError.new("Cannot find type #{ele.type}.")
 	  end
 	  o.elename = ele.name
 	elsif ele.local_complextype
 	  o = SOAPElement.new(ele.name)
-	  ele.local_complextype.each_element do |child_name, child_ele|
-	    o.add(_obj2ele(find_attribute(obj, child_name.name), child_ele))
+	  ele.local_complextype.each_element do |child_ele|
+            o.add(_obj2ele(Mapper.find_attribute(obj, child_ele.name.name),
+              child_ele))
 	  end
 	else
-	  raise RuntimeError.new("Illegal schema?")
+	  raise MappingError.new("Illegal schema?")
 	end
 	o
       end
 
       def obj2type(obj, type)
-	o = SOAPElement.new(type.name)
-	type.each_element do |child_name, child_ele|
-	  o.add(_obj2ele(find_attribute(obj, child_name.name), child_ele))
-	end
+        if type.is_a?(::WSDL::XMLSchema::SimpleType)
+          simple2soap(obj, type)
+        else
+          complex2soap(obj, type)
+        end
+      end
+
+      def simple2soap(obj, type)
+        o = base2soap(obj, TypeMap[type.base])
+        if type.restriction.enumeration.empty?
+          STDERR.puts("#{type.name}: simpleType which is not enum type not supported.")
+          return o
+        end
+        if type.restriction.enumeration.include?(o)
+	  raise MappingError.new("#{o} is not allowed for #{type.name}")
+        end
+        o
+      end
+
+      def complex2soap(obj, type)
+        o = SOAPElement.new(type.name)
+        type.each_element do |child_ele|
+          o.add(_obj2ele(Mapper.find_attribute(obj, child_ele.name.name),
+            child_ele))
+        end
 	o
       end
 
@@ -486,22 +581,13 @@ class WSDLDriver
 	soap_obj = nil
 	if type <= XSD::XSDString
 	  soap_obj = type.new(XSD::Charset.is_ces(obj, $KCODE) ?
-	    XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding) : obj)
+	    XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding) :
+	    obj)
 	else
 	  soap_obj = type.new(obj)
 	end
 	soap_obj
       end
-
-      def find_attribute(obj, attr_name)
-	if obj.respond_to?(attr_name)
-	  obj.__send__(attr_name)
-	elsif obj.is_a?(Hash)
-	  obj[attr_name] || obj[attr_name.intern]
-	else
-	  obj.instance_eval("@#{ attr_name }")
-	end
-      end
     end
   end
 end