soap4r 1.5.5.20061022 → 1.5.6

data/lib/soap/encodingstyle/soapHandler.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP EncodingStyle handler library
-# Copyright (C) 2001, 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;
@@ -72,7 +72,7 @@ class SOAPHandler < Handler
 
   def encode_data_end(generator, ns, data, parent)
     name = generator.encode_name_end(ns, data)
-    cr = data.is_a?(SOAPCompoundtype)
+    cr = (data.is_a?(SOAPCompoundtype) and data.have_member)
     generator.encode_tag_end(name, cr)
   end
 
@@ -186,9 +186,11 @@ class SOAPHandler < Handler
   end
 
   def decode_tag_end(ns, node)
+    textbufstr = @textbuf.join
+    @textbuf.clear
     o = node.node
     if o.is_a?(SOAPUnknown)
-      newnode = if /\A\s*\z/ =~ @textbuf.join
+      newnode = if /\A\s*\z/ =~ textbufstr
 	o.as_struct
       else
 	o.as_string
@@ -199,7 +201,7 @@ class SOAPHandler < Handler
       node.replace_node(newnode)
       o = node.node
     end
-    decode_textbuf(o)
+    decode_textbuf(o, textbufstr)
     # unlink definedtype
     o.definedtype = nil
   end
@@ -332,6 +334,7 @@ private
 	  @decode_typemap.find_name(elename.name)
 	if type
 	  o = SOAPStruct.new(elename)
+          o.elename = elename
 	  o.definedtype = type
 	  return o
 	end
@@ -463,8 +466,7 @@ private
     SOAPUnknown.new(self, elename, type, extraattr)
   end
 
-  def decode_textbuf(node)
-    textbufstr = @textbuf.join
+  def decode_textbuf(node, textbufstr)
     case node
     when XSD::XSDHexBinary, XSD::XSDBase64Binary
       node.set_encoded(textbufstr)
@@ -483,7 +485,6 @@ private
     else
       # Nothing to do...
     end
-    @textbuf.clear
   end
 
   NilLiteralMap = {

data/lib/soap/filter.rb

@@ -0,0 +1,10 @@
+# SOAP4R - SOAP envelope filter.
+# 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/filter/filterchain'
+require 'soap/filter/handler'

data/lib/soap/filter/filterchain.rb

@@ -0,0 +1,51 @@
+# SOAP4R - SOAP envelope filter handler.
+# 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/filter/handler'
+
+
+module SOAP
+module Filter
+
+
+class FilterChain
+
+  def each
+    @array.each do |filter|
+      yield filter
+    end
+  end
+
+  def reverse_each
+    @array.reverse_each do |filter|
+      yield filter
+    end
+  end
+
+  def initialize
+    @array = []
+  end
+
+  def add(filter)
+    @array << filter
+  end
+  alias << add
+
+  def delete(filter)
+    @array.delete(filter)
+  end
+
+  def include?(filter)
+    @array.include?(filter)
+  end
+
+end
+
+
+end
+end

data/lib/soap/filter/handler.rb

@@ -0,0 +1,31 @@
+# SOAP4R - SOAP envelope filter base class.
+# 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.
+
+
+module SOAP
+module Filter
+
+
+class Handler
+
+  # should return envelope.  opt can be updated for other filters.
+  def on_outbound(envelope, opt)
+    # do something.
+    envelope
+  end
+
+  # should return xml.  opt can be updated for other filters.
+  def on_inbound(xml, opt)
+    # do something.
+    xml
+  end
+
+end
+
+
+end
+end

data/lib/soap/generator.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP XML Instance Generator library.
-# Copyright (C) 2001, 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;
@@ -10,6 +10,7 @@ require 'xsd/ns'
 require 'soap/soap'
 require 'soap/baseData'
 require 'soap/encodingstyle/handler'
+require 'xsd/codegen/gensupport'
 
 
 module SOAP
@@ -20,6 +21,7 @@ module SOAP
 #
 class SOAPGenerator
   include SOAP
+  include XSD::CodeGen::GenSupport
 
   class FormatEncodeError < Error; end
 
@@ -68,7 +70,13 @@ public
   end
 
   def encode_data(ns, obj, parent)
-    if obj.is_a?(SOAPEnvelopeElement)
+    if obj.respond_to?(:to_xmlpart)
+      formatted = trim_eol(obj.to_xmlpart)
+      formatted = trim_indent(formatted)
+      formatted = formatted.gsub(/^/, @indent).sub(/\n+\z/, '')
+      @buf << "\n#{formatted}"
+      return
+    elsif obj.is_a?(SOAPEnvelopeElement)
       encode_element(ns, obj, parent)
       return
     end
@@ -110,7 +118,7 @@ public
   end
 
   def encode_element(ns, obj, parent)
-    attrs = {}
+    attrs = obj.extraattr.dup
     if obj.is_a?(SOAPBody)
       @reftarget = obj
       obj.encode(self, ns, attrs) do |child|

data/lib/soap/header/handler.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP Header handler item
-# Copyright (C) 2003, 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;
@@ -36,8 +36,9 @@ class Handler
     # do something.
   end
 
-  def on_outbound_headeritem
-    item = on_outbound
+  def on_outbound_headeritem(header)
+    arity = self.method(:on_outbound).arity
+    item = (arity == 0) ? on_outbound : on_outbound(header)
     if item.nil?
       nil
     elsif item.is_a?(::SOAP::SOAPHeaderItem)
@@ -50,8 +51,8 @@ class Handler
     end
   end
 
-  def on_inbound_headeritem(header)
-    on_inbound(header.element, header.mustunderstand)
+  def on_inbound_headeritem(header, item)
+    on_inbound(item.element, item.mustunderstand)
   end
 end
 

data/lib/soap/header/handlerset.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP Header handler set
-# Copyright (C) 2003, 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;
@@ -38,20 +38,20 @@ class HandlerSet
   end
 
   # returns: Array of SOAPHeaderItem
-  def on_outbound
+  def on_outbound(header)
     @store.collect { |handler|
-      handler.on_outbound_headeritem
+      handler.on_outbound_headeritem(header)
     }.compact
   end
 
-  # headers: SOAPHeaderItem enumerable object
-  def on_inbound(headers)
-    headers.each do |name, item|
+  # header: SOAPHeaderItem enumerable object
+  def on_inbound(header)
+    header.each do |name, item|
       handler = @store.find { |handler|
         handler.elename == item.element.elename
       }
       if handler
-        handler.on_inbound_headeritem(item)
+        handler.on_inbound_headeritem(header, item)
       elsif item.mustunderstand
         raise UnhandledMustUnderstandHeaderError.new(item.element.elename.to_s)
       end

data/lib/soap/header/simplehandler.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP Simple header item handler
-# 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/soap/httpconfigloader.rb

@@ -1,5 +1,5 @@
 # SOAP4R - HTTP config loader.
-# Copyright (C) 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;
@@ -52,7 +52,12 @@ module_function
   end
 
   def set_basic_auth(client, basic_auth)
-    basic_auth.values.each do |url, userid, passwd|
+    basic_auth.values.each do |ele|
+      if ele.is_a?(::Array)
+        url, userid, passwd = ele
+      else
+        url, userid, passwd = ele[:url], ele[:userid], ele[:password]
+      end
       client.set_basic_auth(url, userid, passwd)
     end
   end

data/lib/soap/mapping.rb

@@ -1,5 +1,5 @@
 # SOAP4R - Ruby type mapping utility.
-# 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/soap/mapping/encodedregistry.rb

@@ -1,5 +1,5 @@
 # SOAP4R - encoded mapping registry.
-# Copyright (C) 2000-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;
@@ -295,9 +295,8 @@ class EncodedRegistry
   end
   alias set add
 
-  # general Registry ignores type_qname
   def obj2soap(obj, type_qname = nil)
-    soap = _obj2soap(obj)
+    soap = _obj2soap(obj, type_qname)
     if @allow_original_mapping
       addextend2soap(soap, obj)
     end
@@ -323,7 +322,7 @@ class EncodedRegistry
 
 private
 
-  def _obj2soap(obj)
+  def _obj2soap(obj, type_qname = nil)
     ret = nil
     if obj.is_a?(SOAPStruct) or obj.is_a?(SOAPArray)
       obj.replace do |ele|
@@ -332,6 +331,8 @@ private
       return obj
     elsif obj.is_a?(SOAPBasetype)
       return obj
+    elsif type_qname && type = TypeMap[type_qname]
+      return base2soap(obj, type)
     end
     begin 
       if definition = schema_definition_from_class(obj.class)
@@ -353,14 +354,16 @@ private
 
   # Might return nil as a mapping result.
   def _soap2obj(node, klass = nil)
+    definition = find_node_definition(node)
     if klass
-      definition = schema_definition_from_class(klass)
-    else
-      if definition = schema_definition_from_elename(node.elename)
-        klass = definition.class_for
-      elsif definition = schema_definition_from_type(node.type)
+      klass_definition = schema_definition_from_class(klass)
+      if definition and (definition.class_for < klass)
         klass = definition.class_for
+      else
+        definition = klass_definition
       end
+    else
+      klass = definition.class_for if definition
     end
     if definition and node.is_a?(::SOAP::SOAPStruct)
       return elesoap2stubobj(node, klass, definition)
@@ -369,7 +372,7 @@ private
       conv, obj = @rubytype_factory.soap2obj(nil, node, nil, self)
       return obj if conv
     end
-    conv, obj = @map.soap2obj(node, klass)
+    conv, obj = @map.soap2obj(node)
     return obj if conv
     conv, obj = @default_factory.soap2obj(nil, node, nil, self)
     return obj if conv
@@ -436,11 +439,11 @@ private
 
   def array2soap(obj, definition)
     return SOAPNil.new if obj.nil?      # ToDo: check nillable.
-    arytype = definition.elements[0].elename
-    soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+    eledef = definition.elements[0]
+    soap_obj = SOAPArray.new(ValueArrayName, 1, eledef.elename)
     mark_marshalled_obj(obj, soap_obj)
     obj.each do |item|
-      soap_obj.add(Mapping._obj2soap(item, self, arytype))
+      soap_obj.add(typedobj2soap(item, eledef.mapped_class))
     end
     soap_obj
   end
@@ -457,23 +460,32 @@ private
     end
     definition.elements.each do |eledef|
       name = eledef.elename.name
-      if child = Mapping.get_attribute(obj, eledef.varname)
-        if eledef.as_array?
+      if obj.respond_to?(:each) and eledef.as_array?
+        obj.each do |item|
+          ele.add(name, typedobj2soap(item, eledef.mapped_class))
+        end
+      else
+        child = Mapping.get_attribute(obj, eledef.varname)
+        if child.respond_to?(:each) and eledef.as_array?
           child.each do |item|
-            ele.add(name, Mapping._obj2soap(item, self))
+            ele.add(name, typedobj2soap(item, eledef.mapped_class))
           end
         else
-          ele.add(name, Mapping._obj2soap(child, self))
-        end
-      elsif obj.respond_to?(:each) and eledef.as_array?
-        obj.each do |item|
-          ele.add(name, Mapping._obj2soap(item, self))
+          ele.add(name, typedobj2soap(child, eledef.mapped_class))
         end
       end
     end
     ele
   end
 
+  def typedobj2soap(value, klass)
+    if klass and klass.include?(::SOAP::SOAPBasetype)
+      base2soap(value, klass)
+    else
+      Mapping._obj2soap(value, self)
+    end
+  end
+
   def elesoap2stubobj(node, obj_class, definition)
     obj = Mapping.create_empty_object(obj_class)
     add_elesoap2stubobj(node, obj, definition)
@@ -484,9 +496,7 @@ private
   def add_elesoap2stubobj(node, obj, definition)
     vars = {}
     node.each do |name, value|
-      item = definition.elements.find { |k, v|
-        k.elename == value.elename
-      }
+      item = definition.elements.find_element(value.elename)
       if item
         child = soap2typedobj(value, item.mapped_class)
       else
@@ -501,7 +511,7 @@ private
         vars[name] = child
       end
     end
-    if obj.is_a?(::Array) and vars.keys.size == 1
+    if obj.is_a?(::Array) and is_stubobj_elements_for_array(vars)
       obj.replace(vars.values[0])
     else
       Mapping.set_attributes(obj, vars)
@@ -512,7 +522,7 @@ private
     unless klass
       raise MappingError.new("unknown class: #{klass}")
     end
-    if klass.ancestors.include?(::SOAP::SOAPBasetype)
+    if klass.include?(::SOAP::SOAPBasetype)
       obj = base2obj(value, klass)
     else
       obj = Mapping._soap2obj(value, self, klass)