soap4r 1.5.5.20061022 → 1.5.6

data/lib/wsdl/soap/mappingRegistryCreatorSupport.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating MappingRegistry support.
-# 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;
@@ -28,15 +28,12 @@ module MappingRegistryCreatorSupport
       "[\n" +
         dump_schema_element(definition, indent + 2) + "\n" + sp + "]"
     else
-      varname, name, type = definition
-      '[' +
-        (
-          if name
-            varname.dump + ', [' + ndq(type) + ', ' + dqname(name) + ']'
-          else
-            varname.dump + ', ' + ndq(type)
-          end
-        ) + ']'
+      varname, name, type, occurrence = definition
+      '[' + [
+        varname.dump,
+        dump_type(name, type),
+        dump_occurrence(occurrence)
+      ].compact.join(', ') + ']'
     end
   end
 
@@ -48,6 +45,22 @@ module MappingRegistryCreatorSupport
     }.join(delimiter)
   end
 
+  def dump_type(name, type)
+    if name
+      '[' + ndq(type) + ', ' + dqname(name) + ']'
+    else
+      ndq(type)
+    end
+  end
+
+  def dump_occurrence(occurrence)
+    if occurrence and occurrence != [1, 1] # default
+      minoccurs, maxoccurs = occurrence
+      maxoccurs ||= 'nil'
+      "[#{minoccurs}, #{maxoccurs}]"
+    end
+  end
+
   def parse_elements(elements, base_namespace)
     schema_element = []
     any = false
@@ -60,7 +73,8 @@ module MappingRegistryCreatorSupport
         varname = 'any' # not used
         eleqname = XSD::AnyTypeName
         type = nil
-        schema_element << [varname, eleqname, type]
+        occurrence = nil
+        schema_element << [varname, eleqname, type, occurrence]
       when XMLSchema::Element
         if element.type == XSD::AnyTypeName
           type = nil
@@ -69,6 +83,7 @@ module MappingRegistryCreatorSupport
         elsif element.type
           type = create_class_name(element.type, @modulepath)
         elsif element.ref
+          next if element.ref == SchemaName
           type = create_class_name(element.ref, @modulepath)
         else
           type = nil      # means anyType.
@@ -94,7 +109,8 @@ module MappingRegistryCreatorSupport
         if eleqname && varname == name && eleqname.namespace == base_namespace
           eleqname = nil
         end
-        schema_element << [varname, eleqname, type]
+        occurrence = [element.minoccurs, element.maxoccurs]
+        schema_element << [varname, eleqname, type, occurrence]
       when WSDL::XMLSchema::Sequence
         child_schema_element = parse_elements(element.elements, base_namespace)
         schema_element << child_schema_element
@@ -196,17 +212,19 @@ module MappingRegistryCreatorSupport
     end
   end
 
-  def dump_simpletypedef(qname, simpletype)
+  def dump_simpletypedef(qname, simpletype, as_element = nil, qualified = false)
     if simpletype.restriction
-      dump_simpletypedef_restriction(qname, simpletype)
+      dump_simpletypedef_restriction(qname, simpletype, as_element, qualified)
     elsif simpletype.list
-      dump_simpletypedef_list(qname, simpletype)
+      dump_simpletypedef_list(qname, simpletype, as_element, qualified)
+    elsif simpletype.union
+      dump_simpletypedef_union(qname, simpletype, as_element, qualified)
     else
       raise RuntimeError.new("unknown kind of simpletype: #{simpletype}")
     end
   end
 
-  def dump_simpletypedef_restriction(qname, typedef)
+  def dump_simpletypedef_restriction(qname, typedef, as_element, qualified)
     restriction = typedef.restriction
     if restriction.enumeration.empty?
       # not supported.  minlength?
@@ -214,16 +232,24 @@ module MappingRegistryCreatorSupport
     end
     var = {}
     var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    if typedef.name.nil?
+    if as_element
+      var[:schema_type] = nil
+      var[:schema_ns] = as_element.namespace
+    elsif typedef.name.nil?
       var[:schema_type] = nil
+      var[:schema_ns] = qname.namespace
     else
       var[:schema_type] = qname.name
+      var[:schema_ns] = qname.namespace
     end
     dump_entry(@varname, var)
   end
 
-  def dump_simpletypedef_list(qname, typedef)
+  def dump_simpletypedef_list(qname, typedef, as_element, qualified)
+    nil
+  end
+
+  def dump_simpletypedef_union(qname, typedef, as_element, qualified)
     nil
   end
 end

data/lib/wsdl/soap/methodDefCreator.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;
@@ -40,9 +40,9 @@ class MethodDefCreator
     binding = port.find_binding
     if binding
       binding.operations.each do |op_bind|
-        op = op_bind.find_operation
         next unless op_bind # no binding is defined
         next unless op_bind.soapoperation # not a SOAP operation binding
+        op = op_bind.find_operation
         methoddef << ",\n" unless methoddef.empty?
         methoddef << dump_method(op, op_bind).chomp
       end
@@ -92,14 +92,27 @@ class MethodDefCreator
 private
 
   def dump_method(operation, binding)
+    op_faults = {}
+    binding.fault.each do |fault|
+      op_fault = {}
+      soapfault = fault.soapfault
+      faultclass = create_class_name(fault.name, @modulepath)
+      op_fault[:ns] = fault.name.namespace
+      op_fault[:name] = fault.name.name
+      op_fault[:namespace] = soapfault.namespace
+      op_fault[:use] = soapfault.use || "literal"
+      op_fault[:encodingstyle] = soapfault.encodingstyle || "document"
+      op_faults[faultclass] = op_fault
+    end
+    op_faults_str = op_faults.inspect
+
     name = safemethodname(operation.name)
     name_as = operation.name
     style = binding.soapoperation_style
-    inputuse = binding.input.soapbody_use
-    outputuse = binding.output.soapbody_use
-    namespace = binding.input.soapbody.namespace
+    inputuse = binding.soapbody_use_input
+    outputuse = binding.soapbody_use_output
     if style == :rpc
-      qname = XSD::QName.new(namespace, name_as)
+      qname = binding.soapoperation_name
       paramstr = param2str(collect_rpcparameter(operation))
     else
       qname = nil
@@ -114,8 +127,9 @@ private
 #{ndq(binding.soapaction)},
   #{dq(name)},
   #{paramstr},
-  { :request_style =>  #{sym(style.id2name)}, :request_use =>  #{sym(inputuse.id2name)},
-    :response_style => #{sym(style.id2name)}, :response_use => #{sym(outputuse.id2name)} }
+  { :request_style =>  #{nsym(style)}, :request_use =>  #{nsym(inputuse)},
+    :response_style => #{nsym(style)}, :response_use => #{nsym(outputuse)},
+    :faults => #{op_faults_str} }
 __EOD__
     if inputuse == :encoded or outputuse == :encoded
       @encoded = true
@@ -139,14 +153,9 @@ __EOD__
     if mapped = basetype_mapped_class(part.type)
       ['::' + mapped.name]
     elsif definedtype = @simpletypes[part.type]
-      if definedtype.base
-        ['::' + basetype_mapped_class(definedtype.base).name]
-      else
-        raise RuntimeError.new("unsupported simpleType: #{definedtype}")
-      end
+      [nil, definedtype.name.namespace, definedtype.name.name]
     elsif definedtype = @elements[part.element]
-      #['::SOAP::SOAPStruct', part.element.namespace, part.element.name]
-      ['nil', part.element.namespace, part.element.name]
+      [nil, part.element.namespace, part.element.name]
     elsif definedtype = @complextypes[part.type]
       case definedtype.compoundtype
       when :TYPE_STRUCT, :TYPE_EMPTY    # ToDo: empty should be treated as void.
@@ -162,6 +171,8 @@ __EOD__
       else
 	raise NotImplementedError.new("must not reach here")
       end
+    elsif part.type == XSD::AnyTypeName
+      [nil]
     else
       raise RuntimeError.new("part: #{part.name} cannot be resolved")
     end
@@ -226,9 +237,9 @@ __EOD__
 
   def type2str(type)
     if type.size == 1
-      "[#{dq(type[0])}]" 
+      "[#{ndq(type[0])}]" 
     else
-      "[#{dq(type[0])}, #{ndq(type[1])}, #{dq(type[2])}]" 
+      "[#{ndq(type[0])}, #{ndq(type[1])}, #{dq(type[2])}]" 
     end
   end
 

data/lib/wsdl/soap/operation.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP operation 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;
@@ -18,13 +18,17 @@ class Operation < Info
     attr_reader :style
     attr_reader :op_name
     attr_reader :optype_name
+    attr_reader :encodingstyle
     attr_reader :headerparts
     attr_reader :bodyparts
     attr_reader :faultpart
     attr_reader :soapaction
     
-    def initialize(style, op_name, optype_name, headerparts, bodyparts, faultpart, soapaction)
+    def initialize(style, use, encodingstyle, op_name, optype_name,
+        headerparts, bodyparts, faultpart, soapaction)
       @style = style
+      @use = use
+      @encodingstyle = encodingstyle
       @op_name = op_name
       @optype_name = optype_name
       @headerparts = headerparts
@@ -88,18 +92,14 @@ private
   end
 
   def param_info(name_info, param)
+    op_style = operation_style()
+    op_use = param.soapbody_use
+    op_encodingstyle = param.soapbody_encodingstyle
     op_name = name_info.op_name
     optype_name = name_info.optype_name
-
     soapheader = param.soapheader
     headerparts = soapheader.collect { |item| item.find_part }
-
     soapbody = param.soapbody
-    if soapbody.encodingstyle and
-	soapbody.encodingstyle != ::SOAP::EncodingNamespace
-      raise NotImplementedError.new(
-	"EncodingStyle '#{ soapbody.encodingstyle }' not supported.")
-    end
     if soapbody.namespace
       op_name = XSD::QName.new(soapbody.namespace, op_name.name)
     end
@@ -111,9 +111,9 @@ private
     else
       bodyparts = name_info.parts
     end
-
     faultpart = nil
-    OperationInfo.new(operation_style, op_name, optype_name, headerparts, bodyparts, faultpart, parent.soapaction)
+    OperationInfo.new(op_style, op_use, op_encodingstyle, op_name, optype_name,
+      headerparts, bodyparts, faultpart, parent.soapaction)
   end
 end
 

data/lib/wsdl/soap/servantSkeltonCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating servant skelton 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;
@@ -54,6 +54,7 @@ private
   def dump_porttype(name)
     class_name = create_class_name(name)
     c = XSD::CodeGen::ClassDef.new(class_name)
+    element_definitions = @definitions.collect_elements
     operations = @definitions.porttype(name).operations
     operations.each do |operation|
       name = safemethodname(operation.name)
@@ -66,7 +67,7 @@ private
             raise NotImplementedError.new
           EOD
         end
-      m.comment = dump_method_signature(operation)
+      m.comment = dump_method_signature(operation, element_definitions)
       c.add_method(m)
     end
     c.dump

data/lib/wsdl/soap/standaloneServerStubCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating standalone server stub 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/wsdl2ruby.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL to ruby mapping library.
-# 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;
@@ -57,7 +57,7 @@ private
   def create_file
     @modulepath = @opt['module_path']
     create_classdef if @opt.key?('classdef')
-    create_mapping_registry if @opt.key?('mapping_registry') or @opt.key?('driver')
+    create_mapping_registry if @opt.key?('mapping_registry')
     create_servant_skelton(@opt['servant_skelton']) if @opt.key?('servant_skelton')
     create_cgi_stub(@opt['cgi_stub']) if @opt.key?('cgi_stub')
     create_standalone_server_stub(@opt['standalone_server_stub']) if @opt.key?('standalone_server_stub')
@@ -85,6 +85,7 @@ private
   end
 
   def create_client_skelton(servicename)
+    return if @wsdl.services.empty?
     @logger.info { "Creating client skelton." }
     servicename ||= @wsdl.services[0].name.name
     @client_skelton_filename = servicename + 'Client.rb'
@@ -194,3 +195,8 @@ end
 
 end
 end
+
+
+if __FILE__ == $0
+  warn("WARNING: #{File.expand_path(__FILE__)} is a library file used by bin/wsdl2ruby.rb.  Find bin/wsdl2ruby.rb from tarball version of soap4r or install soap4r via gem.")
+end

data/lib/wsdl/types.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL types definition.
-# 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;

data/lib/wsdl/wsdl.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Base definitions.
-# Copyright (C) 2000, 2001, 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/xmlSchema/all.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexType definition for WSDL.
-# Copyright (C) 2002, 2003, 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;

data/lib/wsdl/xmlSchema/annotation.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP documentation element.
-# Copyright (C) 2003, 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;

data/lib/wsdl/xmlSchema/any.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema any definition for WSDL.
-# Copyright (C) 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;
@@ -21,8 +21,8 @@ class Any < Info
 
   def initialize
     super()
-    @maxoccurs = '1'
-    @minoccurs = '1'
+    @maxoccurs = 1
+    @minoccurs = 1
     @namespace = '##any'
     @process_contents = 'strict'
   end
@@ -38,9 +38,14 @@ class Any < Info
   def parse_attr(attr, value)
     case attr
     when MaxOccursAttrName
-      @maxoccurs = value.source
+      if value.source == 'unbounded'
+        @maxoccurs = nil
+      else
+        @maxoccurs = Integer(value.source)
+      end
+      value.source
     when MinOccursAttrName
-      @minoccurs = value.source
+      @minoccurs = Integer(value.source)
     when NamespaceAttrName
       @namespace = value.source
     when ProcessContentsAttrName

data/lib/wsdl/xmlSchema/attribute.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema attribute definition for WSDL.
-# Copyright (C) 2002, 2003, 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;

data/lib/wsdl/xmlSchema/choice.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexType definition for WSDL.
-# Copyright (C) 2002, 2003, 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;

data/lib/wsdl/xmlSchema/complexContent.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexContent 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;
@@ -38,6 +38,10 @@ class ComplexContent < Info
     @extension || @restriction
   end
 
+  def base
+    content ? content.base : nil
+  end
+
   def have_any?
     content ? content.have_any? : nil
   end
@@ -51,7 +55,12 @@ class ComplexContent < Info
   end
 
   def attributes
-    content.attributes
+    content ? content.attributes : XSD::NamedElements::Empty
+  end
+
+  def nested_elements
+    # restrict and extension does not have particle.
+    content ? content.nested_elements : XSD::NamedElements::Empty
   end
 
   def check_type