* merged from 1_5 branch.

   * enabled Sriver#generate_explicit_type for literal services.
   * test added.
   * removed generated files.


git-svn-id: http://dev.ctor.org/svn/soap4r/trunk@2011 23c4dcf6-64ea-0310-84d7-d424c7495ec0

Author: nahi

lib/soap/baseData.rb

@@ -48,6 +48,7 @@ module SOAPType
   attr_accessor :position
   attr_reader :extraattr
   attr_accessor :definedtype
+  attr_accessor :force_typed
 
   def initialize(*arg)
     super
@@ -60,6 +61,7 @@ def initialize(*arg)
     @position = nil
     @definedtype = nil
     @extraattr = {}
+    @force_typed = false
   end
 
   def inspect

lib/soap/encodingstyle/literalHandler.rb

@@ -29,8 +29,11 @@ def initialize(charset = nil)
   def encode_data(generator, ns, data, parent)
     attrs = {}
     name = generator.encode_name(ns, data, attrs)
+    if data.type and data.type.name and
+        (@generate_explicit_type or data.force_typed)
+      data.extraattr[XSD::AttrTypeName] = data.type
+    end
     data.extraattr.each do |key, value|
-      next if !@generate_explicit_type and key == XSD::AttrTypeName
       keytag = key
       if key.is_a?(XSD::QName)
         keytag = encode_attr_key(attrs, ns, key)

lib/soap/generator.rb

@@ -141,11 +141,8 @@ def encode_element(ns, obj, parent)
       @reftarget = nil
     else
       if obj.is_a?(SOAPEnvelope)
-        # xsi:nil="true" can appear even if dumping without explicit type.
         Generator.assign_ns(attrs, ns, XSD::InstanceNamespace)
-        if @generate_explicit_type
-          Generator.assign_ns(attrs, ns, XSD::Namespace)
-        end
+        Generator.assign_ns(attrs, ns, XSD::Namespace)
       end
       obj.encode(self, ns, attrs) do |child|
 	indent_backup, @indent = @indent, @indent + @indentstr

lib/soap/mapping/literalregistry.rb

@@ -136,9 +136,12 @@ def stubobj2soap(obj, qname, definition)
       ele = SOAPElement.new(qname)
     end
     ele.qualified = definition.qualified
-    if definition.type and (definition.basetype or Mapping.root_type_hint)
-      Mapping.reset_root_type_hint
-      ele.extraattr[XSD::AttrTypeName] = definition.type
+    if definition.type
+      ele.type = definition.type
+      if definition.basetype or Mapping.root_type_hint
+        Mapping.reset_root_type_hint
+        ele.force_typed = true
+      end
     end
     if qname.nil? and definition.elename
       ele.elename = definition.elename

lib/soap/mapping/wsdlliteralregistry.rb

@@ -110,6 +110,11 @@ def obj2typesoap(obj, type)
       else
         ele = complexobj2soap(obj, type)
       end
+      ele.type = type.name
+      if type.base or Mapping.root_type_hint
+        Mapping.reset_root_type_hint
+        ele.force_typed = true
+      end
       add_definedattributes2soap(obj, ele, type)
     end
     ele

lib/soap/rpc/proxy.rb

@@ -56,7 +56,7 @@ def initialize(endpoint_url, soapaction, options)
     # TODO: set to false by default or drop thie option in 1.6.0
     @allow_unqualified_element = true
     @default_encodingstyle = nil
-    @generate_explicit_type = true
+    @generate_explicit_type = nil
     @use_default_namespace = false
     @return_response_as_xml = false
     @headerhandler = Header::HandlerSet.new
@@ -140,6 +140,12 @@ def call(name, *params)
       :default_encodingstyle =>
         @default_encodingstyle || op_info.response_default_encodingstyle
     )
+    if reqopt[:generate_explicit_type].nil?
+      reqopt[:generate_explicit_type] = (op_info.request_use == :encoded)
+    end
+    if resopt[:generate_explicit_type].nil?
+      resopt[:generate_explicit_type] = (op_info.response_use == :encoded)
+    end
     env = route(req_header, req_body, reqopt, resopt)
     if op_info.response_use.nil?
       return nil

lib/xsd/mapping.rb

@@ -30,6 +30,7 @@ def self.xml2obj(stream, klass = nil)
   class Mapper
     MAPPING_OPT = {
       :default_encodingstyle => SOAP::LiteralNamespace,
+      :generate_explicit_type => false,
       :root_type_hint => true
     }.freeze
 

test/soap/fault/test_fault.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+
+
+module SOAP
+module Fault
+
+
+class TestFault < Test::Unit::TestCase
+
+  def setup
+    @client = SOAP::RPC::Driver.new(nil, 'urn:fault')
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method("hello", "msg")
+  end
+
+  def teardown
+    @client.reset_stream if @client
+  end
+
+  def test_fault
+    @client.mapping_registry = SOAP::Mapping::EncodedRegistry.new
+    @client.test_loopback_response << <<__XML__
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <soap:Fault>
+      <faultcode>soap:Server</faultcode>
+      <faultstring>DN cannot be empty</faultstring>
+      <detail />
+    </soap:Fault>
+  </soap:Body>
+</soap:Envelope>
+__XML__
+    begin
+      @client.hello("world")
+      assert(false)
+    rescue ::SOAP::FaultError => e
+      assert_equal("DN cannot be empty", e.message)
+    end
+  end
+end
+
+
+end
+end