soap4r 1.5.5.20061022 → 1.5.6

data/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating class code support from WSDL.
-# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -36,7 +36,7 @@ module ClassDefCreatorSupport
     ::SOAP::TypeMap[name]
   end
 
-  def dump_method_signature(operation)
+  def dump_method_signature(operation, element_definitions)
     name = operation.name
     input = operation.input
     output = operation.output
@@ -47,17 +47,16 @@ module ClassDefCreatorSupport
 #   #{name}#{dump_inputparam(input)}
 #
 # ARGS
-#{dump_inout_type(input).chomp}
+#{dump_inout_type(input, element_definitions).chomp}
 #
 # RETURNS
-#{dump_inout_type(output).chomp}
+#{dump_inout_type(output, element_definitions).chomp}
 #
 __EOD__
     unless fault.empty?
-      faultstr = (fault.collect { |f| dump_inout_type(f).chomp }).join(', ')
       str <<<<__EOD__
 # RAISES
-#   #{faultstr}
+#{dump_fault_type(fault, element_definitions)}
 #
 __EOD__
     end
@@ -73,7 +72,11 @@ __EOD__
   end
 
   def sym(ele)
-    ':' + ele
+    ':' + ele.id2name
+  end
+
+  def nsym(ele)
+    ele.nil? ? 'nil' : sym(ele)
   end
 
   def dqname(qname)
@@ -82,7 +85,7 @@ __EOD__
 
 private
 
-  def dump_inout_type(param)
+  def dump_inout_type(param, element_definitions)
     if param
       message = param.find_message
       params = ""
@@ -90,10 +93,18 @@ private
         name = safevarname(part.name)
         if part.type
           typename = safeconstname(part.type.name)
-          params << add_at("#   #{name}", "#{typename} - #{part.type}\n", 20)
+          qname = part.type
+          params << add_at("#   #{name}", "#{typename} - #{qname}\n", 20)
         elsif part.element
-          typename = safeconstname(part.element.name)
-          params << add_at("#   #{name}", "#{typename} - #{part.element}\n", 20)
+          ele = element_definitions[part.element]
+          if ele.type
+            typename = safeconstname(ele.type.name)
+            qname = ele.type
+          else
+            typename = safeconstname(ele.name.name)
+            qname = ele.name
+          end
+          params << add_at("#   #{name}", "#{typename} - #{qname}\n", 20)
         end
       end
       unless params.empty?
@@ -124,6 +135,12 @@ private
       base + ' ' * (pos - base.size) + str
     end
   end
+
+  def dump_fault_type(fault, element_definitions)
+    fault.collect { |ele|
+      dump_inout_type(ele, element_definitions).chomp
+    }.join("\n")
+  end
 end
 
 

data/lib/wsdl/soap/clientSkeltonCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating client skelton code from WSDL.
-# Copyright (C) 2002, 2003, 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -61,8 +61,9 @@ obj = #{ drv_name }.new(endpoint_url)
 obj.wiredump_dev = STDERR if $DEBUG
 
 __EOD__
+    element_definitions = @definitions.collect_elements
     @definitions.porttype(name).operations.each do |operation|
-      result << dump_method_signature(operation)
+      result << dump_method_signature(operation, element_definitions)
       result << dump_input_init(operation.input) << "\n"
       result << dump_operation(operation) << "\n\n"
     end

data/lib/wsdl/soap/complexType.rb

@@ -1,5 +1,5 @@
 # WSDL4R - SOAP complexType definition for WSDL.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -23,8 +23,7 @@ class ComplexType < Info
     if have_any?
       :TYPE_STRUCT
     elsif content
-      e = elements
-      if attributes.empty? and e.size == 1 and e[0].maxoccurs != '1'
+      if attributes.empty? and map_as_array?
         if name == ::SOAP::Mapping::MapQName
           :TYPE_MAP
         else
@@ -107,7 +106,7 @@ class ComplexType < Info
         end
       end
     end
-    if check_array_content
+    if map_as_array?
       return element_simpletype(elements[0])
     end
     raise RuntimeError.new("Assert: Unknown array definition.")
@@ -117,8 +116,8 @@ class ComplexType < Info
     unless compoundtype == :TYPE_ARRAY
       raise RuntimeError.new("Assert: not for array")
     end
-    if check_array_content
-      return elements[0]
+    if map_as_array?
+      return nested_elements[0]
     end
     nil # use default item name
   end
@@ -143,11 +142,9 @@ private
     end
   end
 
-  def check_array_content
-    e = elements
-    e.size == 1 and e[0].maxoccurs != '1'
-    # content and content.elements.size == 1 and
-    #   content.elements[0].maxoccurs != '1'
+  def map_as_array?
+    e = nested_elements
+    e.size == 1 and e[0].map_as_array?
   end
 
   def content_arytype

data/lib/wsdl/soap/data.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP binding data definitions.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/soap/definitions.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL additional definitions for SOAP.
-# Copyright (C) 2002-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -82,10 +82,18 @@ class Definitions < Info
     collect_fault_messages.each do |name|
       faultparts = message(name).parts
       if faultparts.size != 1
-	raise RuntimeError.new("expecting fault message to have only 1 part")
+	raise RuntimeError.new("Expecting fault message \"#{name}\" to have ONE part")
       end
-      if result.index(faultparts[0].type).nil?
-	result << faultparts[0].type
+      fault_part = faultparts[0]
+      # WS-I Basic Profile Version 1.1 (R2205) requires fault message parts 
+      # to refer to elements rather than types
+      faulttype = fault_part.element
+      if not faulttype
+	warn("Fault message \"#{name}\" part \"#{fault_part.name}\" must specify an \"element\" attribute")
+        faulttype = fault_part.type
+      end
+      if faulttype and result.index(faulttype).nil?
+	result << faulttype
       end
     end
     result
@@ -93,11 +101,48 @@ class Definitions < Info
 
 private
 
+  def get_fault_binding(op_binding, fault_name)
+    op_binding.fault.each do |fault|
+      return fault if fault.name == fault_name
+    end
+    return nil
+  end
+
+  def op_binding_declares_fault(op_binding, fault_name)
+    return get_fault_binding(op_binding, fault_name) != nil
+  end
+
   def collect_fault_messages
     result = []
     porttypes.each do |porttype|
+      port_binding = porttype.find_binding()
+      next unless port_binding
       porttype.operations.each do |operation|
+        op_binding = port_binding.operations.find { |ele| ele.name == operation.name }
+        next unless op_binding
 	operation.fault.each do |fault|
+          # Make sure the operation fault has a name
+          if not fault.name
+            warn("Operation \"#{operation.name}\": fault must specify a \"name\" attribute")
+            next
+          end
+          # Make sure that portType fault has a corresponding soap:fault
+          # definition in binding section.
+          if not op_binding_declares_fault(op_binding, fault.name)
+            warn("Operation \"#{operation.name}\", fault \"#{fault.name}\": no corresponding wsdl:fault binding found with a matching \"name\" attribute")          
+            next
+          end
+          fault_binding = get_fault_binding(op_binding, fault.name)
+          if fault_binding.soapfault.name != fault_binding.name
+            warn("WARNING: name of soap:fault \"#{fault_binding.soapfault.name}\" doesn't match the name of wsdl:fault \"#{fault_binding.name}\" in operation \"#{operation.name}\" \n\n")
+            next
+          end
+          # According to WS-I (R2723): if in a wsdl:binding the use attribute
+          # on a contained soapbind:fault element is present, its value MUST 
+          # be "literal".          
+          if fault_binding.soapfault.use and fault_binding.soapfault.use != "literal"
+            warn("Operation \"#{operation.name}\", fault \"#{fault.name}\": soap:fault \"use\" attribute must be \"literal\"")          
+          end
 	  if result.index(fault.message).nil?
 	    result << fault.message
 	  end

data/lib/wsdl/soap/driverCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating driver code from WSDL.
-# Copyright (C) 2002, 2003, 2005, 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/soap/element.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema element definition for WSDL.
-# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -15,7 +15,8 @@ module XMLSchema
 
 class Element < Info
   def map_as_array?
-    maxoccurs != '1'
+    # parent sequence / choice may be marked as maxOccurs="unbounded"
+    maxoccurs.nil? or maxoccurs != 1 or (parent and parent.map_as_array?)
   end
 
   def attributes

data/lib/wsdl/soap/encodedMappingRegistryCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating EncodedMappingRegistry code from WSDL.
-# Copyright (C) 2002, 2003, 2005, 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/soap/fault.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP body definition.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/soap/header.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP body definition.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/soap/headerfault.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP body definition.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/soap/literalMappingRegistryCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating LiteralMappingRegistry code from WSDL.
-# Copyright (C) 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -34,22 +34,22 @@ class LiteralMappingRegistryCreator
   def dump(varname)
     @varname = varname
     result = ''
-    str = dump_element
+    str = dump_complextype
     unless str.empty?
       result << "\n" unless result.empty?
       result << str
     end
-    str = dump_attribute
+    str = dump_simpletype
     unless str.empty?
       result << "\n" unless result.empty?
       result << str
     end
-    str = dump_complextype
+    str = dump_element
     unless str.empty?
       result << "\n" unless result.empty?
       result << str
     end
-    str = dump_simpletype
+    str = dump_attribute
     unless str.empty?
       result << "\n" unless result.empty?
       result << str
@@ -61,11 +61,19 @@ private
 
   def dump_element
     @elements.collect { |ele|
+      qualified = (ele.elementform == 'qualified')
       if ele.local_complextype
-        qualified = (ele.elementform == 'qualified')
-        dump_complextypedef(ele.name, ele.local_complextype, qualified)
+        dump_complextypedef(ele.name, ele.local_complextype, nil, qualified)
       elsif ele.local_simpletype
-        dump_simpletypedef(ele.name, ele.local_simpletype)
+        dump_simpletypedef(ele.name, ele.local_simpletype, nil, qualified)
+      elsif ele.type
+        if typedef = @complextypes[ele.type]
+          dump_complextypedef(ele.type, typedef, ele.name, qualified)
+        elsif typedef = @simpletypes[ele.type]
+          dump_simpletypedef(ele.type, typedef, ele.name, qualified)
+        else
+          nil
+        end
       else
         nil
       end
@@ -92,14 +100,14 @@ private
     }.compact.join("\n")
   end
 
-  def dump_complextypedef(qname, typedef, qualified = false)
+  def dump_complextypedef(qname, typedef, as_element = nil, qualified = false)
     case typedef.compoundtype
     when :TYPE_STRUCT, :TYPE_EMPTY
-      dump_struct_typemap(qname, typedef, qualified)
+      dump_struct_typemap(qname, typedef, as_element, qualified)
     when :TYPE_ARRAY
       dump_array_typemap(qname, typedef)
     when :TYPE_SIMPLE
-      dump_simple_typemap(qname, typedef)
+      dump_simple_typemap(qname, typedef, as_element, qualified)
     when :TYPE_MAP
       # mapped as a general Hash
       nil
@@ -109,17 +117,19 @@ private
     end
   end
 
-  def dump_struct_typemap(qname, typedef, qualified = false)
+  def dump_struct_typemap(qname, typedef, as_element = nil, qualified = false)
     var = {}
     var[:class] = create_class_name(qname, @modulepath)
-    if typedef.name.nil?
-      # local complextype of a element
+    if as_element
+      var[:schema_name] = as_element.name
+      var[:schema_ns] = as_element.namespace
+    elsif typedef.name.nil?
       var[:schema_name] = qname.name
+      var[:schema_ns] = qname.namespace
     else
-      # named complextype
       var[:schema_type] = qname.name
+      var[:schema_ns] = qname.namespace
     end
-    var[:schema_ns] = qname.namespace
     var[:schema_qualified] = qualified.to_s
 
     parsed_element = parse_elements(typedef.elements, qname.namespace)
@@ -157,25 +167,35 @@ private
     else
       type = nil
     end
-    if child_element
+    occurrence = [0, nil]
+    if child_element and child_element.name
       if child_element.map_as_array?
         type << '[]' if type
+        occurrence = [child_element.minoccurs, child_element.maxoccurs]
       end
       child_element_name = child_element.name
     else
       child_element_name = DEFAULT_ITEM_NAME
     end
     parsed_element = []
-    parsed_element << [child_element_name.name, child_element_name, type]
+    parsed_element << [child_element_name.name, child_element_name, type, occurrence]
     var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
     dump_entry(@varname, var)
   end
 
-  def dump_simple_typemap(qname, type_or_element)
+  def dump_simple_typemap(qname, type_or_element, as_element, qualified)
     var = {}
     var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    var[:schema_type] = qname.name
+    if as_element
+      var[:schema_name] = as_element.name
+      var[:schema_ns] = as_element.namespace
+    elsif type_or_element.name.nil?
+      var[:schema_name] = qname.name
+      var[:schema_ns] = qname.namespace
+    else
+      var[:schema_type] = qname.name
+      var[:schema_ns] = qname.namespace
+    end
     unless type_or_element.attributes.empty?
       var[:schema_attribute] = define_attribute(type_or_element.attributes)
     end

data/lib/wsdl/soap/mappingRegistryCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating MappingRegistry code from WSDL.
-# Copyright (C) 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -10,6 +10,7 @@ require 'wsdl/info'
 require 'wsdl/soap/classDefCreatorSupport'
 require 'wsdl/soap/encodedMappingRegistryCreator'
 require 'wsdl/soap/literalMappingRegistryCreator'
+require 'xsd/codegen/moduledef.rb'
 
 
 module WSDL