soap4r 1.5.7 → 1.5.8

data/lib/soap/netHttpClient.rb

@@ -7,6 +7,7 @@
 
 
 require 'net/http'
+require 'soap/filter/filterchain'
 
 
 module SOAP

data/lib/soap/ns.rb

@@ -0,0 +1,34 @@
+# SOAP4R - SOAP Namespace library
+# 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 'xsd/datatypes'
+require 'xsd/ns'
+require 'soap/soap'
+
+
+module SOAP
+
+
+class NS < XSD::NS
+  KNOWN_TAG = XSD::NS::KNOWN_TAG.dup.update(
+    SOAP::EnvelopeNamespace => 'env'
+  )
+
+  def initialize(tag2ns = nil)
+    super(tag2ns)
+  end
+
+private
+
+  def default_known_tag
+    KNOWN_TAG
+  end
+end
+
+
+end

data/lib/soap/parser.rb

@@ -6,9 +6,9 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'xsd/ns'
 require 'xsd/xmlparser'
 require 'soap/soap'
+require 'soap/ns'
 require 'soap/baseData'
 require 'soap/encodingstyle/handler'
 
@@ -112,7 +112,7 @@ public
     @lastnode
   end
 
-  def start_element(name, attrs)
+  def start_element(name, raw_attrs)
     lastframe = @parsestack.last
     ns = parent = parent_encodingstyle = nil
     if lastframe
@@ -120,13 +120,14 @@ public
       parent = lastframe.node
       parent_encodingstyle = lastframe.encodingstyle
     else
-      ns = XSD::NS.new
+      ns = SOAP::NS.new
       parent = ParseFrame::NodeContainer.new(nil)
       parent_encodingstyle = nil
     end
     # ns might be the same
-    ns, attrs = XSD::XMLParser.filter_ns(ns, attrs)
-    encodingstyle = find_encodingstyle(ns, attrs)
+    ns, raw_attrs = XSD::XMLParser.filter_ns(ns, raw_attrs)
+    attrs = decode_attrs(ns, raw_attrs)
+    encodingstyle = attrs[AttrEncodingStyleName]
     # Children's encodingstyle is derived from its parent.
     if encodingstyle.nil?
       if parent.node.is_a?(SOAPHeader)
@@ -149,13 +150,10 @@ public
   end
 
   def characters(text)
-    lastframe = @parsestack.last
-    if lastframe
+    # Ignore Text outside of SOAP Envelope.
+    if lastframe = @parsestack.last
       # Need not to be cloned because character does not have attr.
       decode_text(lastframe.ns, text, lastframe.handler)
-    else
-      # Ignore Text outside of SOAP Envelope.
-      p text if $DEBUG
     end
   end
 
@@ -171,15 +169,6 @@ public
 
 private
 
-  def find_encodingstyle(ns, attrs)
-    attrs.each do |key, value|
-      if (ns.compare(@envelopenamespace, AttrEncodingStyle, key))
-	return value
-      end
-    end
-    nil
-  end
-
   def decode_tag(ns, name, attrs, parent, handler)
     ele = ns.parse(name)
     # Envelope based parsing.
@@ -196,6 +185,15 @@ private
     return handler.decode_tag_end(ns, node)
   end
 
+  def decode_attrs(ns, attrs)
+    extraattr = {}
+    attrs.each do |key, value|
+      qname = ns.parse_local(key)
+      extraattr[qname] = value
+    end
+    extraattr
+  end
+
   def decode_text(ns, text, handler)
     handler.decode_text(ns, text)
   end
@@ -210,23 +208,28 @@ private
 	end
       end
     elsif ele.name == EleHeader
-      unless parent.node.is_a?(SOAPEnvelope)
-	raise FormatDecodeError.new("Header should be a child of Envelope.")
-      end
+      return nil unless parent.node.is_a?(SOAPEnvelope)
       o = SOAPHeader.new
       parent.node.header = o
     elsif ele.name == EleBody
-      unless parent.node.is_a?(SOAPEnvelope)
-	raise FormatDecodeError.new("Body should be a child of Envelope.")
-      end
+      return nil unless parent.node.is_a?(SOAPEnvelope)
       o = SOAPBody.new
       parent.node.body = o
     elsif ele.name == EleFault
-      unless parent.node.is_a?(SOAPBody)
-	raise FormatDecodeError.new("Fault should be a child of Body.")
+      if parent.node.is_a?(SOAPBody)
+        o = SOAPFault.new
+        parent.node.fault = o
+      elsif parent.node.is_a?(SOAPEnvelope)
+        # live.com server returns SOAPFault as a direct child of SOAPEnvelope.
+        # support it even if it's not spec compliant.
+        warn("Fault must be a child of Body.")
+        body = SOAPBody.new
+        parent.node.body = body
+        o = SOAPFault.new
+        body.fault = o
+      else
+        return nil
       end
-      o = SOAPFault.new
-      parent.node.fault = o
     end
     o.extraattr.update(attrs) if o
     o

data/lib/soap/processor.rb

@@ -50,7 +50,7 @@ module Processor
   private
 
     def create_generator(opt)
-      SOAPGenerator.new(opt)
+      Generator.new(opt)
     end
 
     def create_parser(opt)

data/lib/soap/rpc/driver.rb

@@ -60,6 +60,7 @@ class Driver
   __attr_proxy :allow_unqualified_element, true
   __attr_proxy :default_encodingstyle, true
   __attr_proxy :generate_explicit_type, true
+  __attr_proxy :use_default_namespace, true
   __attr_proxy :return_response_as_xml, true
   __attr_proxy :headerhandler
   __attr_proxy :filterchain

data/lib/soap/rpc/element.rb

@@ -56,7 +56,7 @@ class SOAPBody < SOAPStruct
 
   def fault=(fault)
     @is_fault = true
-    add_member('fault', fault)
+    add('fault', fault)
   end
 end
 
@@ -219,10 +219,7 @@ 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
+      mapped_class, nsdef, namedef = SOAPMethod.parse_param_type(param_type)
       if nsdef && namedef
         type_qname = XSD::QName.new(nsdef, namedef)
       elsif mapped_class
@@ -243,13 +240,28 @@ private
           raise MethodDefinitionError.new('duplicated retval')
         end
         @retval_name = name
-        @retval_class_name = nil
         @retval_class_name = mapped_class
       else
         raise MethodDefinitionError.new("unknown type: #{io_type}")
       end
     end
   end
+
+  def self.parse_param_type(param_type)
+    mapped_class, nsdef, namedef = param_type
+    # the first element of typedef in param_def can be a String like
+    # "::SOAP::SOAPStruct" or "CustomClass[]".  turn this String to a class if
+    # we can.
+    if mapped_class.is_a?(String)
+      if /\[\]\Z/ =~ mapped_class
+        # when '[]' is added, ignore this.
+        mapped_class = nil
+      else
+        mapped_class = Mapping.class_from_name(mapped_class)
+      end
+    end
+    [mapped_class, nsdef, namedef]
+  end
 end
 
 

data/lib/soap/rpc/httpserver.rb

@@ -20,6 +20,44 @@ class HTTPServer < Logger::Application
   attr_reader :server
   attr_accessor :default_namespace
 
+  class << self
+    if RUBY_VERSION >= "1.7.0"
+      def __attr_proxy(symbol, assignable = false)
+        name = symbol.to_s
+        define_method(name) {
+          @router.__send__(name)
+        }
+        if assignable
+          aname = name + '='
+          define_method(aname) { |rhs|
+            @router.__send__(aname, rhs)
+          }
+        end
+      end
+    else
+      def __attr_proxy(symbol, assignable = false)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @router.#{name}
+          end
+        EOS
+        if assignable
+          module_eval <<-EOS
+            def #{name}=(value)
+              @router.#{name} = value
+            end
+          EOS
+        end
+      end
+    end
+  end
+
+  __attr_proxy :mapping_registry, true
+  __attr_proxy :literal_mapping_registry, true
+  __attr_proxy :generate_explicit_type, true
+  __attr_proxy :use_default_namespace, true
+
   def initialize(config)
     actor = config[:SOAPHTTPServerApplicationName] || self.class.name
     super(actor)
@@ -60,30 +98,6 @@ class HTTPServer < Logger::Application
     @soaplet.authenticator = authenticator
   end
 
-  def mapping_registry
-    @router.mapping_registry
-  end
-
-  def mapping_registry=(mapping_registry)
-    @router.mapping_registry = mapping_registry
-  end
-
-  def literal_mapping_registry
-    @router.literal_mapping_registry
-  end
-
-  def literal_mapping_registry=(literal_mapping_registry)
-    @router.literal_mapping_registry = literal_mapping_registry
-  end
-
-  def generate_explicit_type
-    @router.generate_explicit_type
-  end
-
-  def generate_explicit_type=(generate_explicit_type)
-    @router.generate_explicit_type = generate_explicit_type
-  end
-
   # servant entry interface
 
   def add_rpc_request_servant(factory, namespace = @default_namespace)

data/lib/soap/rpc/proxy.rb

@@ -32,6 +32,7 @@ public
   attr_accessor :allow_unqualified_element
   attr_accessor :default_encodingstyle
   attr_accessor :generate_explicit_type
+  attr_accessor :use_default_namespace
   attr_accessor :return_response_as_xml
   attr_reader :headerhandler
   attr_reader :filterchain
@@ -52,9 +53,11 @@ public
     @operation_by_qname = {}
     @operation_by_soapaction = {}
     @mandatorycharset = nil
+    # TODO: set to false by default or drop thie option in 1.6.0
     @allow_unqualified_element = true
     @default_encodingstyle = nil
     @generate_explicit_type = true
+    @use_default_namespace = false
     @return_response_as_xml = false
     @headerhandler = Header::HandlerSet.new
     @filterchain = Filter::FilterChain.new
@@ -129,15 +132,13 @@ public
       :envelopenamespace => @options["soap.envelope.requestnamespace"],
       :default_encodingstyle =>
         @default_encodingstyle || op_info.request_default_encodingstyle,
-      :elementformdefault => op_info.elementformdefault,
-      :attributeformdefault => op_info.attributeformdefault
+      :use_default_namespace =>
+        op_info.use_default_namespace || @use_default_namespace
     )
     resopt = create_encoding_opt(
       :envelopenamespace => @options["soap.envelope.responsenamespace"],
       :default_encodingstyle =>
-        @default_encodingstyle || op_info.response_default_encodingstyle,
-      :elementformdefault => op_info.elementformdefault,
-      :attributeformdefault => op_info.attributeformdefault
+        @default_encodingstyle || op_info.response_default_encodingstyle
     )
     env = route(req_header, req_body, reqopt, resopt)
     if op_info.response_use.nil?
@@ -350,8 +351,7 @@ private
     attr_reader :response_style
     attr_reader :request_use
     attr_reader :response_use
-    attr_reader :elementformdefault
-    attr_reader :attributeformdefault
+    attr_reader :use_default_namespace
 
     def initialize(soapaction, param_def, opt)
       @soapaction = soapaction
@@ -359,9 +359,11 @@ private
       @response_style = opt[:response_style]
       @request_use = opt[:request_use]
       @response_use = opt[:response_use]
-      # set nil(unqualified) by default
-      @elementformdefault = opt[:elementformdefault]
-      @attributeformdefault = opt[:attributeformdefault]
+      @use_default_namespace =
+        opt[:use_default_namespace] || opt[:elementformdefault]
+      if opt.key?(:elementformdefault)
+        warn("option :elementformdefault is deprecated.  use :use_default_namespace instead")
+      end
       check_style(@request_style)
       check_style(@response_style)
       check_use(@request_use)
@@ -489,7 +491,8 @@ private
       idx = 0
       names.each do |name|
         params[name] = Mapping.obj2soap(values[idx], mapping_registry, 
-          types[idx] || XSD::QName.new, opt)
+          types[idx], opt)
+        params[name].elename = XSD::QName.new(nil, name)
         idx += 1
       end
       method.set_param(params)

data/lib/soap/rpc/router.rb

@@ -30,6 +30,7 @@ class Router
   attr_accessor :mapping_registry
   attr_accessor :literal_mapping_registry
   attr_accessor :generate_explicit_type
+  attr_accessor :use_default_namespace
   attr_accessor :external_ces
   attr_reader :filterchain
 
@@ -39,6 +40,7 @@ class Router
     @headerhandler = Header::HandlerSet.new
     @literal_mapping_registry = ::SOAP::Mapping::LiteralRegistry.new
     @generate_explicit_type = true
+    @use_default_namespace = false
     @external_ces = nil
     @operation_by_soapaction = {}
     @operation_by_qname = {}
@@ -322,6 +324,7 @@ private
     opt[:external_content] = nil
     opt[:default_encodingstyle] = default_encodingstyle
     opt[:generate_explicit_type] = @generate_explicit_type
+    opt[:use_default_namespace] = @use_default_namespace
     @filterchain.reverse_each do |filter|
       env = filter.on_outbound(env, opt)
       break unless env
@@ -476,7 +479,7 @@ private
 
     def request_rpc(body, mapping_registry, literal_mapping_registry, opt)
       request = body.request
-      unless request.is_a?(SOAPStruct)
+      unless request.is_a?(SOAPNameAccessible)
         if request.is_a?(SOAPNil)
           # SOAP::Lite/0.69 seems to send xsi:nil="true" element as a request.
           request = SOAPStruct.new(request.elename)

data/lib/soap/soap.rb

@@ -8,12 +8,13 @@
 
 require 'xsd/qname'
 require 'xsd/charset'
+require 'soap/nestedexception'
 
 
 module SOAP
 
 
-VERSION = Version = '1.5.7'
+VERSION = Version = '1.5.8'
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -38,6 +39,8 @@ AttrRoot = 'root'
 AttrArrayType = 'arrayType'
 AttrOffset = 'offset'
 AttrPosition = 'position'
+AttrHref = 'href'
+AttrId = 'id'
 ValueArray = 'Array'
 
 EleEnvelopeName = XSD::QName.new(EnvelopeNamespace, EleEnvelope).freeze
@@ -55,17 +58,15 @@ AttrRootName = XSD::QName.new(EncodingNamespace, AttrRoot).freeze
 AttrArrayTypeName = XSD::QName.new(EncodingNamespace, AttrArrayType).freeze
 AttrOffsetName = XSD::QName.new(EncodingNamespace, AttrOffset).freeze
 AttrPositionName = XSD::QName.new(EncodingNamespace, AttrPosition).freeze
+AttrHrefName = XSD::QName.new(nil, AttrHref).freeze
+AttrIdName = XSD::QName.new(nil, AttrId).freeze
 ValueArrayName = XSD::QName.new(EncodingNamespace, ValueArray).freeze
 
 Base64Literal = 'base64'
 
-SOAPNamespaceTag = 'env'
-XSDNamespaceTag = 'xsd'
-XSINamespaceTag = 'xsi'
-
 MediaType = 'text/xml'
 
-class Error < StandardError; end
+class Error < StandardError; include NestedException; end
 
 class StreamError < Error; end
 class HTTPStreamError < StreamError; end