soap4r 1.5.5.20061022 → 1.5.6

data/lib/wsdl/binding.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL binding 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/data.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL 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/definitions.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL 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/documentation.rb

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

data/lib/wsdl/import.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL import 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/importer.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL importer library.
-# 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/info.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL information base.
-# 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/message.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL message 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/operation.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL operation 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;
@@ -45,13 +45,17 @@ class Operation < Info
     parent.targetnamespace
   end
 
+  def operationname
+    as_operationname(@name)
+  end
+
   def input_info
     if message = input_message
       typename = message.name
     else
       typename = nil
     end
-    NameInfo.new(operationname(@name), typename, inputparts)
+    NameInfo.new(operationname, typename, inputparts)
   end
 
   def output_info
@@ -60,11 +64,10 @@ class Operation < Info
     else
       typename = nil
     end
-    NameInfo.new(operationname(@name), typename, outputparts)
+    NameInfo.new(operationname, typename, outputparts)
   end
 
   EMPTY = [].freeze
-
   def inputparts
     if message = input_message
       sort_parts(message.parts)
@@ -75,7 +78,7 @@ class Operation < Info
 
   def inputname
     if input
-      operationname(input.name ? input.name.name : @name)
+      as_operationname(input.name ? input.name.name : @name)
     else
       nil
     end
@@ -91,7 +94,7 @@ class Operation < Info
 
   def outputname
     if output
-      operationname(output.name ? output.name.name : @name + 'Response')
+      as_operationname(output.name ? output.name.name : @name + 'Response')
     else
       nil
     end
@@ -166,7 +169,7 @@ private
     result
   end
 
-  def operationname(name)
+  def as_operationname(name)
     XSD::QName.new(targetnamespace, name)
   end
 end

data/lib/wsdl/operationBinding.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL bound operation 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;
@@ -49,11 +49,11 @@ class OperationBinding < Info
   end
 
   def soapoperation_name
-    if @soapoperation
-      @soapoperation.input_info.op_name
-    else
-      find_operation.name
+    op_name = find_operation.operationname
+    if @input and @input.soapbody and @input.soapbody.namespace
+      op_name = XSD::QName.new(@input.soapbody.namespace, op_name.name)
     end
+    op_name
   end
 
   def soapoperation_style
@@ -68,6 +68,14 @@ class OperationBinding < Info
     style || :document
   end
 
+  def soapbody_use_input
+    soapbody_use(@input)
+  end
+
+  def soapbody_use_output
+    soapbody_use(@output)
+  end
+
   def soapaction
     if @soapoperation
       @soapoperation.soapaction
@@ -110,6 +118,12 @@ class OperationBinding < Info
       nil
     end
   end
+
+private
+
+  def soapbody_use(param)
+    param ? param.soapbody_use : nil
+  end
 end
 
 

data/lib/wsdl/param.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL param 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;
@@ -40,7 +40,15 @@ class Param < Info
     if @soapbody
       @soapbody.use || :literal
     else
-      raise RuntimeError.new("soap:body not found")
+      nil
+    end
+  end
+
+  def soapbody_encodingstyle
+    if @soapbody
+      @soapbody.encodingstyle
+    else
+      nil
     end
   end
 
@@ -56,7 +64,7 @@ class Param < Info
       o
     when SOAPFaultName
       o = WSDL::SOAP::Fault.new
-      @soap_fault = o
+      @soapfault = o
       o
     when DocumentationName
       o = Documentation.new

data/lib/wsdl/parser.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL XML Instance parser library.
-# 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;
@@ -74,13 +74,14 @@ public
     lastframe = @parsestack.last
     ns = parent = nil
     if lastframe
-      ns = lastframe.ns.clone_ns
+      ns = lastframe.ns
       parent = lastframe.node
     else
       ns = XSD::NS.new
       parent = nil
     end
-    attrs = XSD::XMLParser.filter_ns(ns, attrs)
+    # ns might be the same
+    ns, attrs = XSD::XMLParser.filter_ns(ns, attrs)
     node = decode_tag(ns, name, attrs, parent)
     @parsestack << ParseFrame.new(ns, name, node)
   end

data/lib/wsdl/part.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL part 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/port.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL port 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/portType.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL portType 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/service.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL service 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/address.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP address 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/binding.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL SOAP binding 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/body.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;
@@ -43,6 +43,8 @@ class Body < Info
       end
     when EncodingStyleAttrName
       @encodingstyle = value.source
+      @encodingstyle = nil if @encodingstyle.to_s.empty?
+      value.source
     when NamespaceAttrName
       @namespace = value.source
     else

data/lib/wsdl/soap/cgiStubCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating CGI 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/classDefCreator.rb

@@ -1,5 +1,5 @@
 # WSDL4R - Creating class definition from WSDL
-# Copyright (C) 2002-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;
@@ -46,22 +46,22 @@ class ClassDefCreator
     if type
       result << dump_classdef(type.name, type)
     else
-      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
@@ -79,11 +79,10 @@ 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)
       elsif ele.local_simpletype
-        qualified = (ele.elementform == 'qualified')
         dump_simpletypedef(ele.name, ele.local_simpletype, qualified)
       else
         nil
@@ -106,7 +105,7 @@ private
   end
 
   def dump_complextype
-    @complextypes.collect { |type|
+    definitions = sort_dependency(@complextypes).collect { |type|
       dump_complextypedef(type.name, type)
     }.compact.join("\n")
   end
@@ -116,6 +115,8 @@ private
       dump_simpletypedef_restriction(qname, simpletype, qualified)
     elsif simpletype.list
       dump_simpletypedef_list(qname, simpletype, qualified)
+    elsif simpletype.union
+      dump_simpletypedef_union(qname, simpletype, qualified)
     else
       raise RuntimeError.new("unknown kind of simpletype: #{simpletype}")
     end
@@ -128,6 +129,7 @@ private
       return nil
     end
     classname = create_class_name(qname)
+    check_classname(classname)
     c = ClassDef.new(classname, '::String')
     c.comment = "#{qname}"
     define_classenum_restriction(c, classname, restriction.enumeration)
@@ -136,7 +138,9 @@ private
 
   def dump_simpletypedef_list(qname, typedef, qualified)
     list = typedef.list
-    c = ClassDef.new(create_class_name(qname), '::Array')
+    classname = create_class_name(qname)
+    check_classname(classname)
+    c = ClassDef.new(classname, '::Array')
     c.comment = "#{qname}"
     if simpletype = list.local_simpletype
       if simpletype.restriction.nil?
@@ -144,7 +148,7 @@ private
           "unknown kind of simpletype: #{simpletype}")
       end
       define_stringenum_restriction(c, simpletype.restriction.enumeration)
-      c.comment << "\n  contains list of #{create_class_name(qname)}::*"
+      c.comment << "\n  contains list of #{classname}::*"
     elsif list.itemtype
       c.comment << "\n  contains list of #{create_class_name(list.itemtype)}::*"
     else
@@ -153,6 +157,17 @@ private
     c.dump
   end
 
+  def dump_simpletypedef_union(qname, typedef, qualified)
+    union = typedef.union
+    c = ClassDef.new(create_class_name(qname), '::String')
+    c.comment = "#{qname}"
+    if union.member_types
+      # fixme
+      c.comment << "\n any of #{union.member_types}"
+    end
+    c.dump
+  end
+
   def define_stringenum_restriction(c, enumeration)
     const = {}
     enumeration.each do |value|
@@ -178,7 +193,9 @@ private
   end
 
   def dump_simpleclassdef(qname, type_or_element)
-    c = ClassDef.new(create_class_name(qname), '::String')
+    classname = create_class_name(qname)
+    check_classname(classname)
+    c = ClassDef.new(classname, '::String')
     c.comment = "#{qname}"
     init_lines = []
     unless type_or_element.attributes.empty?
@@ -209,10 +226,18 @@ private
   end
 
   def dump_classdef(qname, typedef, qualified = false)
+    classname = create_class_name(qname)
+    check_classname(classname)
+    baseclassname = nil
+    if typedef.complexcontent
+      if base = typedef.complexcontent.base
+        baseclassname = create_class_name(base)
+      end
+    end
     if @faulttypes and @faulttypes.index(qname)
-      c = ClassDef.new(create_class_name(qname), '::StandardError')
+      c = ClassDef.new(classname, '::StandardError')
     else
-      c = ClassDef.new(create_class_name(qname))
+      c = ClassDef.new(classname, baseclassname)
     end
     c.comment = "#{qname}"
     c.comment << "\nabstract" if typedef.abstract
@@ -245,6 +270,7 @@ private
         end
         init_lines << "@__xmlele_any = nil"
       when XMLSchema::Element
+        next if element.ref == SchemaName
         name = name_element(element).name
         attrname = safemethodname(name)
         varname = safevarname(name)
@@ -329,10 +355,48 @@ private
   end
 
   def dump_arraydef(qname, complextype)
-    c = ClassDef.new(create_class_name(qname), '::Array')
+    classname = create_class_name(qname)
+    check_classname(classname)
+    c = ClassDef.new(classname, '::Array')
     c.comment = "#{qname}"
     c.dump
   end
+
+  def check_classname(classname)
+    if @modulepath.nil? and Module.constants.include?(classname)
+      warn("created definition re-opens an existing toplevel class: #{classname}")
+    end
+  end
+
+  def sort_dependency(types)
+    dep = {}
+    root = []
+    types.each do |type|
+      if type.complexcontent and (base = type.complexcontent.base)
+        dep[base] ||= []
+        dep[base] << type
+      else
+        root << type
+      end
+    end
+    sorted = []
+    root.each do |type|
+      sorted.concat(collect_dependency(type, dep))
+    end
+    sorted.concat(dep.values.flatten)
+    sorted
+  end
+
+  # removes collected key from dep
+  def collect_dependency(type, dep)
+    result = [type]
+    return result unless dep.key?(type.name)
+    dep[type.name].each do |deptype|
+      result.concat(collect_dependency(deptype, dep))
+    end
+    dep.delete(type.name)
+    result
+  end
 end