soap4r 1.5.5.20061022 → 1.5.6

data/lib/soap/parser.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP XML Instance Parser library.
-# Copyright (C) 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;
@@ -28,7 +28,9 @@ private
   class ParseFrame
     attr_reader :node
     attr_reader :name
-    attr_reader :ns, :encodingstyle
+    attr_reader :ns
+    attr_reader :encodingstyle
+    attr_reader :handler
 
     class NodeContainer
       def initialize(node)
@@ -46,15 +48,22 @@ private
 
   public
 
-    def initialize(ns, name, node, encodingstyle)
+    def initialize(ns, name, node, encodingstyle, handler)
       @ns = ns
       @name = name
-      self.node = node
+      @node = NodeContainer.new(node)
       @encodingstyle = encodingstyle
+      @handler = handler
     end
 
-    def node=(node)
-      @node = NodeContainer.new(node)
+    # to avoid memory consumption
+    def update(ns, name, node, encodingstyle, handler)
+      @ns = ns
+      @name = name
+      @node.replace_node(node)
+      @encodingstyle = encodingstyle
+      @handler = handler
+      self
     end
   end
 
@@ -69,6 +78,7 @@ public
     @opt = opt
     @parser = XSD::XMLParser.create_parser(self, opt)
     @parsestack = nil
+    @recycleframe = nil
     @lastnode = nil
     @handlers = {}
     @envelopenamespace = opt[:envelopenamespace] || EnvelopeNamespace
@@ -106,7 +116,7 @@ public
     lastframe = @parsestack.last
     ns = parent = parent_encodingstyle = nil
     if lastframe
-      ns = lastframe.ns.clone_ns
+      ns = lastframe.ns
       parent = lastframe.node
       parent_encodingstyle = lastframe.encodingstyle
     else
@@ -114,10 +124,9 @@ public
       parent = ParseFrame::NodeContainer.new(nil)
       parent_encodingstyle = nil
     end
-
-    attrs = XSD::XMLParser.filter_ns(ns, attrs)
+    # ns might be the same
+    ns, attrs = XSD::XMLParser.filter_ns(ns, attrs)
     encodingstyle = find_encodingstyle(ns, attrs)
-
     # Children's encodingstyle is derived from its parent.
     if encodingstyle.nil?
       if parent.node.is_a?(SOAPHeader)
@@ -126,17 +135,24 @@ public
         encodingstyle = parent_encodingstyle || @default_encodingstyle
       end
     end
-
-    node = decode_tag(ns, name, attrs, parent, encodingstyle)
-
-    @parsestack << ParseFrame.new(ns, name, node, encodingstyle)
+    handler = find_handler(encodingstyle)
+    unless handler
+      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+    end
+    node = decode_tag(ns, name, attrs, parent, handler)
+    if @recycleframe
+      @parsestack << @recycleframe.update(ns, name, node, encodingstyle, handler)
+      @recycleframe = nil
+    else
+      @parsestack << ParseFrame.new(ns, name, node, encodingstyle, handler)
+    end
   end
 
   def characters(text)
     lastframe = @parsestack.last
     if lastframe
       # Need not to be cloned because character does not have attr.
-      decode_text(lastframe.ns, text, lastframe.encodingstyle)
+      decode_text(lastframe.ns, text, lastframe.handler)
     else
       # Ignore Text outside of SOAP Envelope.
       p text if $DEBUG
@@ -148,8 +164,9 @@ public
     unless name == lastframe.name
       raise UnexpectedElementError.new("Closing element name '#{ name }' does not match with opening element '#{ lastframe.name }'.")
     end
-    decode_tag_end(lastframe.ns, lastframe.node, lastframe.encodingstyle)
+    decode_tag_end(lastframe.ns, lastframe.node, lastframe.handler)
     @lastnode = lastframe.node.node
+    @recycleframe = lastframe
   end
 
 private
@@ -163,44 +180,24 @@ private
     nil
   end
 
-  def decode_tag(ns, name, attrs, parent, encodingstyle)
+  def decode_tag(ns, name, attrs, parent, handler)
     ele = ns.parse(name)
-
     # Envelope based parsing.
     if ((ele.namespace == @envelopenamespace) ||
 	(@allow_unqualified_element && ele.namespace.nil?))
       o = decode_soap_envelope(ns, ele, attrs, parent)
       return o if o
     end
-
     # Encoding based parsing.
-    handler = find_handler(encodingstyle)
-    if handler
-      return handler.decode_tag(ns, ele, attrs, parent)
-    else
-      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
-    end
+    return handler.decode_tag(ns, ele, attrs, parent)
   end
 
-  def decode_tag_end(ns, node, encodingstyle)
-    return unless encodingstyle
-
-    handler = find_handler(encodingstyle)
-    if handler
-      return handler.decode_tag_end(ns, node)
-    else
-      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
-    end
+  def decode_tag_end(ns, node, handler)
+    return handler.decode_tag_end(ns, node)
   end
 
-  def decode_text(ns, text, encodingstyle)
-    handler = find_handler(encodingstyle)
-
-    if handler
-      handler.decode_text(ns, text)
-    else
-      # How should I do?
-    end
+  def decode_text(ns, text, handler)
+    handler.decode_text(ns, text)
   end
 
   def decode_soap_envelope(ns, ele, attrs, parent)
@@ -231,6 +228,7 @@ private
       o = SOAPFault.new
       parent.node.fault = o
     end
+    o.extraattr.update(attrs) if o
     o
   end
 

data/lib/soap/processor.rb

@@ -1,5 +1,5 @@
 # SOAP4R - marshal/unmarshal interface.
-# 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/soap/property.rb

@@ -1,5 +1,5 @@
 # soap/property.rb: SOAP4R - Property implementation.
-# 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;
@@ -65,13 +65,13 @@ class Property
 
   KEY_REGSRC = '([^=:\\\\]*(?:\\\\.[^=:\\\\]*)*)'
   DEF_REGSRC = '\\s*' + KEY_REGSRC + '\\s*[=:]\\s*(.*)'
-  COMMENT_REGEXP = Regexp.new('^(?:#.*|)$')
-  CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$")
-  LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$")
+  COMMENT_REGEXP = Regexp.new('^(?:#.*|)$', nil, 'u')
+  CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$", nil, 'u')
+  LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$", nil, 'u')
   def load(stream)
     key_prefix = ""
     stream.each_with_index do |line, lineno|
-      line.sub!(/\r?\n\z/, '')
+      line.sub!(/\r?\n\z/u, '')
       case line
       when COMMENT_REGEXP
 	next
@@ -279,7 +279,7 @@ private
     when Symbol
       [name]
     when String
-      name.scan(/[^.\\]+(?:\\.[^.\\])*/)	# split with unescaped '.'
+      name.scan(/[^.\\]+(?:\\.[^.\\])*/u)	# split with unescaped '.'
     when Array
       name
     else
@@ -311,7 +311,7 @@ private
   end
 
   def loadstr(str)
-    str.gsub(/\\./) { |c| eval("\"#{c}\"") }
+    str.gsub(/\\./u) { |c| eval("\"#{c}\"") }
   end
 end
 

data/lib/soap/proxy.rb

@@ -1,5 +1,5 @@
 # SOAP4R - Proxy library.
-# Copyright (C) 2000, 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/qname.rb

@@ -1,5 +1,5 @@
 # SOAP4R - XML QName definition.
-# 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/rpc/cgistub.rb

@@ -1,5 +1,5 @@
 # SOAP4R - CGI/mod_ruby stub 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;
@@ -34,6 +34,11 @@ class CGIStub < Logger::Application
     def [](var); end
 
     def meta_vars; end
+
+    EMPTY_COOKIES = [].freeze
+    def cookies; EMPTY_COOKIES; end
+
+    def user; end
   end
 
   class SOAPStdinRequest < SOAPRequest
@@ -53,6 +58,18 @@ class CGIStub < Logger::Application
         'HTTP_SOAPACTION' => ENV['HTTP_SOAPAction']
       }
     end
+
+    def cookies
+      if cookie = ENV['HTTP_Cookie'] || ENV['Cookie']
+        [WEBrick::Cookie.parse(cookie)]
+      else
+        EMPTY_COOKIES
+      end
+    end
+
+    def user
+      ENV['REMOTE_USER']
+    end
   end
 
   class SOAPFCGIRequest < SOAPRequest
@@ -72,6 +89,18 @@ class CGIStub < Logger::Application
         'HTTP_SOAPACTION' => @request.env['HTTP_SOAPAction']
       }
     end
+
+    def cookies
+      if cookie = @request.env['HTTP_Cookie'] || @request.env['Cookie']
+        [WEBrick::Cookie.parse(cookie)]
+      else
+        EMPTY_COOKIES
+      end
+    end
+
+    def user
+      @request.env['REMOTE_USER']
+    end
   end
 
   def initialize(appname, default_namespace)
@@ -125,6 +154,10 @@ class CGIStub < Logger::Application
   end
   alias add_rpc_headerhandler add_headerhandler
 
+  def filterchain
+    @router.filterchain
+  end
+
   # method entry interface
 
   def add_rpc_method(obj, name, *param)

data/lib/soap/rpc/driver.rb

@@ -1,5 +1,5 @@
 # SOAP4R - SOAP RPC driver
-# Copyright (C) 2000, 2001, 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;
@@ -62,6 +62,7 @@ class Driver
   __attr_proxy :generate_explicit_type, true
   __attr_proxy :return_response_as_xml, true
   __attr_proxy :headerhandler
+  __attr_proxy :filterchain
   __attr_proxy :streamhandler
   __attr_proxy :test_loopback_response
   __attr_proxy :reset_stream

data/lib/soap/rpc/element.rb

@@ -1,5 +1,5 @@
 # SOAP4R - RPC element definition.
-# Copyright (C) 2000, 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;
@@ -100,6 +100,10 @@ class SOAPMethod < SOAPStruct
     init_param(@param_def) if @param_def
   end
 
+  def have_member
+    true
+  end
+
   def have_outparam?
     @outparam_names.size > 0
   end
@@ -112,6 +116,14 @@ class SOAPMethod < SOAPStruct
     collect_params(OUT, INOUT)
   end
 
+  def input_param_types
+    collect_param_types(IN, INOUT)
+  end
+
+  def output_param_types
+    collect_param_types(OUT, INOUT)
+  end
+
   def set_param(params)
     params.each do |param, data|
       @inparam[param] = data
@@ -129,9 +141,9 @@ class SOAPMethod < SOAPStruct
 
   def get_paramtypes(names)
     types = []
-    @signature.each do |io_type, name, param_type|
-      if param_type && idx = names.index(name)
-        types[idx] = XSD::QName.new(param_type[1], param_type[2])
+    @signature.each do |io_type, name, type_qname|
+      if type_qname && idx = names.index(name)
+        types[idx] = type_qname
       end
     end
     types
@@ -189,9 +201,17 @@ class SOAPMethod < SOAPStruct
 
 private
 
+  def collect_param_types(*type)
+    names = []
+    @signature.each do |io_type, name, type_qname|
+      names << type_qname if type.include?(io_type)
+    end
+    names
+  end
+
   def collect_params(*type)
     names = []
-    @signature.each do |io_type, name, param_type|
+    @signature.each do |io_type, name, type_qname|
       names << name if type.include?(io_type)
     end
     names
@@ -199,15 +219,24 @@ private
 
   def init_param(param_def)
     param_def.each do |io_type, name, param_type|
+      mapped_class, nsdef, namedef = param_type
+      if mapped_class.is_a?(String)
+        mapped_class = Mapping.class_from_name(mapped_class)
+      end
+      if nsdef && namedef
+        type_qname = XSD::QName.new(nsdef, namedef)
+      elsif mapped_class
+        type_qname = TypeMap.index(mapped_class)
+      end
       case io_type
       when IN
-        @signature.push([IN, name, param_type])
+        @signature.push([IN, name, type_qname])
         @inparam_names.push(name)
       when OUT
-        @signature.push([OUT, name, param_type])
+        @signature.push([OUT, name, type_qname])
         @outparam_names.push(name)
       when INOUT
-        @signature.push([INOUT, name, param_type])
+        @signature.push([INOUT, name, type_qname])
         @inoutparam_names.push(name)
       when RETVAL
         if @retval_name
@@ -215,13 +244,7 @@ private
         end
         @retval_name = name
         @retval_class_name = nil
-        if param_type
-          if param_type[0].is_a?(String)
-            @retval_class_name = Mapping.class_from_name(param_type[0])
-          else
-            @retval_class_name = param_type[0]
-          end
-        end
+        @retval_class_name = mapped_class
       else
         raise MethodDefinitionError.new("unknown type: #{io_type}")
       end
@@ -284,6 +307,10 @@ class SOAPMethodResponse < SOAPMethod
     @retval = nil
   end
 
+  def retval
+    @retval
+  end
+
   def retval=(retval)
     @retval = retval
     @retval.elename = @retval.elename.dup_name(@retval_name || 'return')

data/lib/soap/rpc/httpserver.rb

@@ -1,5 +1,5 @@
 # SOAP4R - WEBrick HTTP Server
-# Copyright (C) 2003, 2004, 2005 by 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,6 +52,14 @@ class HTTPServer < Logger::Application
     @server.shutdown if @server
   end
 
+  def authenticator
+    @soaplet.authenticator
+  end
+
+  def authenticator=(authenticator)
+    @soaplet.authenticator = authenticator
+  end
+
   def mapping_registry
     @router.mapping_registry
   end
@@ -95,6 +103,10 @@ class HTTPServer < Logger::Application
   end
   alias add_rpc_headerhandler add_headerhandler
 
+  def filterchain
+    @router.filterchain
+  end
+
   # method entry interface
 
   def add_rpc_method(obj, name, *param)