soap4r 1.5.7 → 1.5.8

data/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -16,20 +16,17 @@ module WSDL
 module SOAP
 
 
+# requires @defined_const, @simpletypes, @name_creator
 module ClassDefCreatorSupport
   include XSD::CodeGen::GenSupport
 
-  def create_class_name(qname, modulepath = nil)
-    if klass = basetype_mapped_class(qname)
-      ::SOAP::Mapping::DefaultRegistry.find_mapped_obj_class(klass).name
-    else
-      name = safeconstname(qname.name)
-      if modulepath
-        [modulepath, name].join('::')
-      else
-        name
-      end
-    end
+  def mapped_class_name(qname, modulepath)
+    @name_creator.assign_name(qname, modulepath)
+  end
+
+  def mapped_class_basename(qname, modulepath)
+    classname = @name_creator.assign_name(qname, modulepath)
+    classname.sub(/\A.*:/, '')
   end
 
   def basetype_mapped_class(name)
@@ -80,7 +77,51 @@ __EOD__
   end
 
   def dqname(qname)
-    qname.dump
+    if @defined_const.key?(qname.namespace)
+      qname.dump(@defined_const[qname.namespace])
+    else
+      qname.dump
+    end
+  end
+
+  def assign_const(value, prefix = '')
+    return if value.nil? or @defined_const.key?(value)
+    name = value.scan(/[^:\/]+\/?\z/)[0] || 'C'
+    tag = prefix + safeconstname(name)
+    if @defined_const.value?(tag)
+      idx = 0
+      while true
+        tag = prefix + safeconstname(name + "_#{idx}")
+        break unless @defined_const.value?(tag)
+        idx += 1
+        raise RuntimeError.new("too much similar names") if idx > 100
+      end
+    end
+    @defined_const[value] = tag
+  end
+
+  def create_type_name(modulepath, element)
+    if element.type == XSD::AnyTypeName
+      # nil means anyType.
+      nil
+    elsif simpletype = @simpletypes[element.type]
+      if simpletype.restriction and simpletype.restriction.enumeration?
+        mapped_class_name(element.type, modulepath)
+      else
+        nil
+      end
+    elsif klass = element_basetype(element)
+      klass.name
+    elsif element.type
+      mapped_class_name(element.type, modulepath)
+    elsif element.ref
+      mapped_class_name(element.ref, modulepath)
+    elsif element.anonymous_type?
+      # inner class
+      mapped_class_name(element.name, modulepath)
+    else
+      nil
+    end
   end
 
 private
@@ -141,6 +182,47 @@ private
       dump_inout_type(ele, element_definitions).chomp
     }.join("\n")
   end
+
+  def element_basetype(ele)
+    if klass = basetype_class(ele.type)
+      klass
+    elsif ele.local_simpletype
+      basetype_class(ele.local_simpletype.base)
+    else
+      nil
+    end
+  end
+
+  def attribute_basetype(attr)
+    if klass = basetype_class(attr.type)
+      klass
+    elsif attr.local_simpletype
+      basetype_class(attr.local_simpletype.base)
+    else
+      nil
+    end
+  end
+
+  def basetype_class(type)
+    return nil if type.nil?
+    if simpletype = @simpletypes[type]
+      basetype_mapped_class(simpletype.base)
+    else
+      basetype_mapped_class(type)
+    end
+  end
+
+  def name_element(element)
+    return element.name if element.name 
+    return element.ref if element.ref
+    raise RuntimeError.new("cannot define name of #{element}")
+  end
+
+  def name_attribute(attribute)
+    return attribute.name if attribute.name 
+    return attribute.ref if attribute.ref
+    raise RuntimeError.new("cannot define name of #{attribute}")
+  end
 end
 
 

data/lib/wsdl/soap/classNameCreator.rb

@@ -0,0 +1,54 @@
+# WSDL4R - Class name creator.
+# 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;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/mapping/typeMap'
+require 'xsd/codegen/gensupport'
+
+
+module WSDL
+module SOAP
+
+
+class ClassNameCreator
+  include XSD::CodeGen::GenSupport
+
+  def initialize
+    @classname = {}
+  end
+
+  def assign_name(qname, modulepath = nil)
+    key = [modulepath, qname]
+    unless @classname.key?(key)
+      if klass = ::SOAP::TypeMap[qname]
+        name =
+          ::SOAP::Mapping::DefaultRegistry.find_mapped_obj_class(klass).name
+      else
+        name = safeconstname(qname.name)
+        if modulepath
+          name = [modulepath, name].join('::')
+        end
+        while @classname.value?(name)
+          name += '_'
+        end
+        check_classname(name)
+      end
+      @classname[key] = name.freeze
+    end
+    @classname[key]
+  end
+
+  def check_classname(name)
+    if Object.constants.include?(name)
+      warn("created definition re-opens an existing toplevel class: #{name}.  consider to use --module_path option of wsdl2ruby.rb")
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/soap/clientSkeltonCreator.rb

@@ -19,8 +19,9 @@ class ClientSkeltonCreator
 
   attr_reader :definitions
 
-  def initialize(definitions, modulepath = nil)
+  def initialize(definitions, name_creator, modulepath = nil)
     @definitions = definitions
+    @name_creator = name_creator
     @modulepath = modulepath
   end
 
@@ -36,7 +37,7 @@ class ClientSkeltonCreator
       result << "\n\n"
     end
     services.ports.each do |port|
-      result << dump_porttype(port.porttype.name)
+      result << dump_porttype(port.porttype)
       result << "\n"
     end
     if @modulepath
@@ -49,8 +50,8 @@ class ClientSkeltonCreator
 
 private
 
-  def dump_porttype(name)
-    drv_name = create_class_name(name)
+  def dump_porttype(porttype)
+    drv_name = mapped_class_basename(porttype.name, @modulepath)
 
     result = ""
     result << <<__EOD__
@@ -62,7 +63,7 @@ obj.wiredump_dev = STDERR if $DEBUG
 
 __EOD__
     element_definitions = @definitions.collect_elements
-    @definitions.porttype(name).operations.each do |operation|
+    porttype.operations.each do |operation|
       result << dump_method_signature(operation, element_definitions)
       result << dump_input_init(operation.input) << "\n"
       result << dump_operation(operation) << "\n\n"

data/lib/wsdl/soap/complexType.rb

@@ -93,7 +93,7 @@ class ComplexType < Info
     ele.local_complextype
   end
 
-  def find_arytype
+  def find_soapenc_arytype
     unless compoundtype == :TYPE_ARRAY
       raise RuntimeError.new("Assert: not for array")
     end
@@ -106,6 +106,15 @@ class ComplexType < Info
         end
       end
     end
+  end
+
+  def find_arytype
+    unless compoundtype == :TYPE_ARRAY
+      raise RuntimeError.new("Assert: not for array")
+    end
+    if arytype = find_soapenc_arytype
+      return arytype
+    end
     if map_as_array?
       return element_simpletype(elements[0])
     end

data/lib/wsdl/soap/definitions.rb

@@ -133,6 +133,10 @@ private
             next
           end
           fault_binding = get_fault_binding(op_binding, fault.name)
+          if fault_binding.soapfault.nil?
+            warn("WARNING: no soap:fault found for wsdl:fault \"#{fault_binding.name}\" in operation \"#{operation.name}\" \n\n")
+            next
+          end
           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

data/lib/wsdl/soap/driverCreator.rb

@@ -21,19 +21,22 @@ class DriverCreator
   include ClassDefCreatorSupport
 
   attr_reader :definitions
+  attr_accessor :drivername_postfix
 
-  def initialize(definitions, modulepath = nil)
+  def initialize(definitions, name_creator, modulepath = nil)
     @definitions = definitions
+    @name_creator = name_creator
     @modulepath = modulepath
+    @drivername_postfix = ''
   end
 
   def dump(porttype = nil)
-    result = ''
+    result = "require 'soap/rpc/driver'\n\n"
     if @modulepath
-      result << "\n"
       @modulepath.each do |name|
         result << "module #{name}\n"
       end
+      result << "\n"
     end
     if porttype.nil?
       @definitions.porttypes.each do |type|
@@ -55,8 +58,11 @@ class DriverCreator
 private
 
   def dump_porttype(porttype)
-    class_name = create_class_name(porttype)
-    result = MethodDefCreator.new(@definitions, @modulepath).dump(porttype)
+    drivername = porttype.name + @drivername_postfix
+    qname = XSD::QName.new(porttype.namespace, drivername)
+    class_name = mapped_class_basename(qname, @modulepath)
+    defined_const = {}
+    result = MethodDefCreator.new(@definitions, @name_creator, @modulepath, defined_const).dump(porttype)
     methoddef = result[:methoddef]
     binding = @definitions.bindings.find { |item| item.type == porttype }
     if binding.nil? or binding.soapbinding.nil?
@@ -66,7 +72,6 @@ private
     address = @definitions.porttype(porttype).locations[0]
 
     c = XSD::CodeGen::ClassDef.new(class_name, "::SOAP::RPC::Driver")
-    c.def_require("soap/rpc/driver")
     c.def_const("DefaultEndpointUrl", ndq(address))
     c.def_code <<-EOD
 Methods = [
@@ -101,6 +106,9 @@ Methods = [
         end
       EOD
     end
+    defined_const.each do |ns, tag|
+      c.def_const(tag, dq(ns))
+    end
     c.dump
   end
 end

data/lib/wsdl/soap/element.rb

@@ -19,6 +19,10 @@ class Element < Info
     maxoccurs.nil? or maxoccurs != 1 or (parent and parent.map_as_array?)
   end
 
+  def anonymous_type?
+    !@ref and @name and @local_complextype
+  end
+
   def attributes
     @local_complextype.attributes
   end

data/lib/wsdl/soap/encodedMappingRegistryCreator.rb

@@ -19,14 +19,16 @@ class EncodedMappingRegistryCreator
 
   attr_reader :definitions
 
-  def initialize(definitions, modulepath)
+  def initialize(definitions, name_creator, modulepath, defined_const)
     @definitions = definitions
+    @name_creator = name_creator
     @modulepath = modulepath
     @simpletypes = definitions.collect_simpletypes
     @simpletypes.uniq!
     @complextypes = definitions.collect_complextypes
     @complextypes.uniq!
     @varname = nil
+    @defined_const = defined_const
   end
 
   def dump(varname)
@@ -49,67 +51,21 @@ private
 
   def dump_complextype
     @complextypes.collect { |type|
-      dump_complextypedef(type.name, type) unless type.abstract
+      unless type.abstract
+        dump_with_inner {
+          dump_complextypedef(@modulepath, type.name, type, nil, :encoded => true)
+        }
+      end
     }.compact.join("\n")
   end
 
   def dump_simpletype
     @simpletypes.collect { |type|
-      dump_simpletypedef(type.name, type)
+      dump_with_inner {
+        dump_simpletypedef(@modulepath, type.name, type, nil, :encoded => true)
+      }
     }.compact.join("\n")
   end
-
-  def dump_complextypedef(qname, typedef)
-    case typedef.compoundtype
-    when :TYPE_STRUCT, :TYPE_EMPTY
-      dump_struct_typemap(qname, typedef)
-    when :TYPE_ARRAY
-      dump_array_typemap(qname, typedef)
-    when :TYPE_SIMPLE
-      dump_simple_typemap(qname, typedef)
-    when :TYPE_MAP
-      nil
-    else
-      raise NotImplementedError.new("must not reach here: #{typedef.compoundtype}")
-    end
-  end
-
-  def dump_struct_typemap(qname, typedef)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    if typedef.name.nil?
-      # local complextype of a element
-      var[:schema_name] = qname.name
-    else
-      # named complextype
-      var[:schema_type] = qname.name
-    end
-    parsed_element = parse_elements(typedef.elements, qname.namespace)
-    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
-    dump_entry(@varname, var)
-  end
-
-  def dump_array_typemap(qname, typedef)
-    arytype = typedef.find_arytype || XSD::AnyTypeName
-    type = XSD::QName.new(arytype.namespace, arytype.name.sub(/\[(?:,)*\]$/, ''))
-    return <<__EOD__
-#{@varname}.set(
-  #{create_class_name(qname, @modulepath)},
-  ::SOAP::SOAPArray,
-  ::SOAP::Mapping::EncodedRegistry::TypedArrayFactory,
-  { :type => #{dqname(type)} }
-)
-__EOD__
-  end
-
-  def dump_simple_typemap(qname, typedef)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    var[:schema_type] = qname.name
-    dump_entry(@varname, var)
-  end
 end
 
 

data/lib/wsdl/soap/literalMappingRegistryCreator.rb

@@ -17,8 +17,9 @@ module SOAP
 class LiteralMappingRegistryCreator
   include MappingRegistryCreatorSupport
 
-  def initialize(definitions, modulepath)
+  def initialize(definitions, name_creator, modulepath, defined_const)
     @definitions = definitions
+    @name_creator = name_creator
     @modulepath = modulepath
     @elements = definitions.collect_elements
     @elements.uniq!
@@ -29,6 +30,7 @@ class LiteralMappingRegistryCreator
     @complextypes = definitions.collect_complextypes
     @complextypes.uniq!
     @varname = nil
+    @defined_const = defined_const
   end
 
   def dump(varname)
@@ -61,150 +63,50 @@ private
 
   def dump_element
     @elements.collect { |ele|
-      qualified = (ele.elementform == 'qualified')
-      if ele.local_complextype
-        dump_complextypedef(ele.name, ele.local_complextype, nil, qualified)
-      elsif 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
+      # has the definition different from the complexType of the same name
+      next if ele.type.nil? and @complextypes[ele.name]
+      dump_with_inner {
+        if typedef = ele.local_complextype
+          dump_complextypedef(@modulepath, ele.name, typedef)
+        elsif typedef = ele.local_simpletype
+          dump_simpletypedef(@modulepath, ele.name, typedef)
+        elsif ele.type
+          if typedef = @complextypes[ele.type]
+            dump_complextypedef(@modulepath, ele.type, typedef, ele.name)
+          elsif typedef = @simpletypes[ele.type]
+            dump_simpletypedef(@modulepath, ele.type, typedef, ele.name)
+          end
         end
-      else
-        nil
-      end
+      }
     }.compact.join("\n")
   end
 
   def dump_attribute
     @attributes.collect { |attr|
       if attr.local_simpletype
-        dump_simpletypedef(attr.name, attr.local_simpletype)
+        dump_with_inner {
+          dump_simpletypedef(@modulepath, attr.name, attr.local_simpletype)
+        }
       end
     }.compact.join("\n")
   end
 
   def dump_simpletype
     @simpletypes.collect { |type|
-      dump_simpletypedef(type.name, type)
+      dump_with_inner {
+        dump_simpletypedef(@modulepath, type.name, type)
+      }
     }.compact.join("\n")
   end
 
   def dump_complextype
     @complextypes.collect { |type|
-      dump_complextypedef(type.name, type) unless type.abstract
-    }.compact.join("\n")
-  end
-
-  def dump_complextypedef(qname, typedef, as_element = nil, qualified = false)
-    case typedef.compoundtype
-    when :TYPE_STRUCT, :TYPE_EMPTY
-      dump_struct_typemap(qname, typedef, as_element, qualified)
-    when :TYPE_ARRAY
-      dump_array_typemap(qname, typedef)
-    when :TYPE_SIMPLE
-      dump_simple_typemap(qname, typedef, as_element, qualified)
-    when :TYPE_MAP
-      # mapped as a general Hash
-      nil
-    else
-      raise RuntimeError.new(
-        "unknown kind of complexContent: #{typedef.compoundtype}")
-    end
-  end
-
-  def dump_struct_typemap(qname, typedef, as_element = nil, qualified = false)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    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
-      var[:schema_type] = qname.name
-      var[:schema_ns] = qname.namespace
-    end
-    var[:schema_qualified] = qualified.to_s
-
-    parsed_element = parse_elements(typedef.elements, qname.namespace)
-    if typedef.choice?
-      parsed_element.unshift(:choice)
-    end
-    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
-    unless typedef.attributes.empty?
-      var[:schema_attribute] = define_attribute(typedef.attributes)
-    end
-    dump_entry(@varname, var)
-  end
-
-  DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
-
-  def dump_array_typemap(qname, typedef)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    if typedef.name.nil?
-      # local complextype of a element
-      var[:schema_name] = qname.name
-    else
-      # named complextype
-      var[:schema_type] = qname.name
-    end
-    child_type = typedef.child_type
-    child_element = typedef.find_aryelement
-    if child_type == XSD::AnyTypeName
-      type = nil
-    elsif child_element
-      if klass = element_basetype(child_element)
-        type = klass.name
-      else
-        typename = child_element.type || child_element.name
-        type = create_class_name(typename, @modulepath)
+      unless type.abstract
+        dump_with_inner {
+          dump_complextypedef(@modulepath, type.name, type)
+        }
       end
-    elsif child_type
-      type = create_class_name(child_type, @modulepath)
-    else
-      type = nil
-    end
-    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, occurrence]
-    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
-    dump_entry(@varname, var)
-  end
-
-  def dump_simple_typemap(qname, type_or_element, as_element, qualified)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    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
-    dump_entry(@varname, var)
+    }.compact.join("\n")
   end
 end