soap4r 1.5.7 → 1.5.8

data/lib/soap/mapping/registry.rb

@@ -51,9 +51,7 @@ class Object
   end
 
   def [](qname)
-    unless qname.is_a?(XSD::QName)
-      qname = XSD::QName.new(nil, qname)
-    end
+    qname = Mapping.to_qname(qname)
     @__xmlele.each do |k, v|
       return v if k == qname
     end
@@ -65,9 +63,7 @@ class Object
   end
 
   def []=(qname, value)
-    unless qname.is_a?(XSD::QName)
-      qname = XSD::QName.new(nil, qname)
-    end
+    qname = Mapping.to_qname(qname)
     found = false
     @__xmlele.each do |pair|
       if pair[0] == qname
@@ -110,7 +106,7 @@ private
   # much memory for each singleton Object.  just instance_eval instead of it.
   def __define_attr_accessor(qname)
     # untaint depends GenSupport.safemethodname
-    name = XSD::CodeGen::GenSupport.safemethodname(qname.name).untaint
+    name = Mapping.safemethodname(qname.name).untaint
     # untaint depends on QName#dump
     qnamedump = qname.dump.untaint
     singleton = false
@@ -178,6 +174,7 @@ module RegistrySupport
   def initialize
     super()
     @class_schema_definition = {}
+    @class_elename_schema_definition = {}
     @elename_schema_definition = {}
     @type_schema_definition = {}
   end
@@ -189,7 +186,8 @@ module RegistrySupport
     if !@class_schema_definition[obj_class] or definition.type
       @class_schema_definition[obj_class] = definition
     end
-    if definition.elename
+    if definition.elename and !definition.is_anonymous?
+      @class_elename_schema_definition[obj_class] = definition
       @elename_schema_definition[definition.elename] = definition
     end
     if definition.type
@@ -201,6 +199,10 @@ module RegistrySupport
     @class_schema_definition[klass] || Mapping.schema_definition_classdef(klass)
   end
 
+  def elename_schema_definition_from_class(klass)
+    @class_elename_schema_definition[klass]
+  end
+
   def schema_definition_from_elename(qname)
     @elename_schema_definition[qname]
   end
@@ -218,7 +220,7 @@ module RegistrySupport
 
   def find_schema_definition(name)
     return nil unless name
-    typestr = XSD::CodeGen::GenSupport.safeconstname(name)
+    typestr = Mapping.safeconstname(name)
     obj_class = Mapping.class_from_name(typestr)
     if obj_class
       schema_definition_from_class(obj_class)
@@ -226,12 +228,8 @@ module RegistrySupport
   end
   
   def add_attributes2soap(obj, ele)
-    definition = Mapping.schema_definition_classdef(obj.class)
-    if definition && attributes = definition.attributes
-      attributes.each do |qname, param|
-        at = Mapping.get_attribute(obj, XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name))
-        ele.extraattr[qname] = at
-      end
+    if definition = Mapping.schema_definition_classdef(obj.class)
+      add_definedattributes2soap(obj, ele, definition)
     elsif obj.respond_to?(:__xmlattr)
       obj.__xmlattr.each do |key, value|
         ele.extraattr[key] = value
@@ -239,12 +237,30 @@ module RegistrySupport
     end
   end
 
+  def add_definedattributes2soap(obj, ele, typedef)
+    if typedef.attributes
+      typedef.attributes.each do |qname, param|
+        value = get_xmlattr_value(obj, qname)
+        ele.extraattr[qname] = value unless value.nil?
+      end
+    end
+  end
+
+  def get_xmlattr_value(obj, qname)
+    attrname = 'xmlattr_' + qname.name
+    value = Mapping.get_attribute(obj, attrname)
+    if value.nil?
+      attrname = Mapping.safemethodname('xmlattr_' + qname.name)
+      value = Mapping.get_attribute(obj, attrname)
+    end
+    value
+  end
+
   def base2soap(obj, type, qualified = nil)
     return SOAPNil.new if obj.nil?
     soap_obj = nil
     if type <= XSD::XSDString
-      str = XSD::Charset.encoding_conv(obj.to_s,
-        Thread.current[:SOAPMapping][:ExternalCES],
+      str = XSD::Charset.encoding_conv(obj.to_s, Mapping.external_ces,
         XSD::Charset.encoding)
       soap_obj = type.new(str)
     else
@@ -265,7 +281,7 @@ module RegistrySupport
     if value.is_a?(klass)
       v
     else
-      klass.new(v).data
+      klass.to_data(v)
     end
   end
 

data/lib/soap/mapping/schemadefinition.rb

@@ -141,18 +141,25 @@ class SchemaDefinition
   attr_reader :class_for
   attr_reader :elename, :type
   attr_reader :qualified
+  attr_accessor :basetype
   attr_accessor :attributes
   attr_accessor :elements
 
-  def initialize(class_for, elename, type, qualified)
+  def initialize(class_for, elename, type, anonymous, qualified)
     @class_for = class_for
     @elename = elename
     @type = type
+    @anonymous = anonymous
     @qualified = qualified
+    @basetype = nil
     @elements = EMPTY
     @attributes = nil
   end
 
+  def is_anonymous?
+    @anonymous
+  end
+
   def choice?
     @elements.choice?
   end

data/lib/soap/mapping/typeMap.rb

@@ -16,6 +16,15 @@ TypeMap = {
   XSD::XSDNormalizedString::Type => SOAPNormalizedString,
   XSD::XSDToken::Type => SOAPToken,
   XSD::XSDLanguage::Type => SOAPLanguage,
+  XSD::XSDNMTOKEN::Type => SOAPNMTOKEN,
+  XSD::XSDNMTOKENS::Type => SOAPNMTOKENS,
+  XSD::XSDName::Type => SOAPName,
+  XSD::XSDNCName::Type => SOAPNCName,
+  XSD::XSDID::Type => SOAPID,
+  XSD::XSDIDREF::Type => SOAPIDREF,
+  XSD::XSDIDREFS::Type => SOAPIDREFS,
+  XSD::XSDENTITY::Type => SOAPENTITY,
+  XSD::XSDENTITIES::Type => SOAPENTITIES,
   XSD::XSDBoolean::Type => SOAPBoolean,
   XSD::XSDDecimal::Type => SOAPDecimal,
   XSD::XSDFloat::Type => SOAPFloat,
@@ -52,6 +61,15 @@ TypeMap = {
   SOAP::SOAPNormalizedString::Type => SOAPNormalizedString,
   SOAP::SOAPToken::Type => SOAPToken,
   SOAP::SOAPLanguage::Type => SOAPLanguage,
+  SOAP::SOAPNMTOKEN::Type => SOAPNMTOKEN,
+  SOAP::SOAPNMTOKENS::Type => SOAPNMTOKENS,
+  SOAP::SOAPName::Type => SOAPName,
+  SOAP::SOAPNCName::Type => SOAPNCName,
+  SOAP::SOAPID::Type => SOAPID,
+  SOAP::SOAPIDREF::Type => SOAPIDREF,
+  SOAP::SOAPIDREFS::Type => SOAPIDREFS,
+  SOAP::SOAPENTITY::Type => SOAPENTITY,
+  SOAP::SOAPENTITIES::Type => SOAPENTITIES,
   SOAP::SOAPBoolean::SOAPENCType => SOAPBoolean,
   SOAP::SOAPDecimal::SOAPENCType => SOAPDecimal,
   SOAP::SOAPFloat::SOAPENCType => SOAPFloat,

data/lib/soap/mapping/wsdlencodedregistry.rb

@@ -55,9 +55,15 @@ class WSDLEncodedRegistry < EncodedRegistry
 
   # map anything for now: must refer WSDL while mapping.  [ToDo]
   def soap2obj(node, obj_class = nil)
+    cause = nil
     begin
-      return any2obj(node, obj_class)
+      unless obj_class
+        typestr = Mapping.safeconstname(node.elename.name)
+        obj_class = Mapping.class_from_name(typestr)
+      end
+      return Mapping._soap2obj(node, Mapping::DefaultRegistry, obj_class)
     rescue MappingError
+      cause = $!
     end
     if @excn_handler_soap2obj
       begin
@@ -67,7 +73,7 @@ class WSDLEncodedRegistry < EncodedRegistry
       rescue Exception
       end
     end
-    raise MappingError.new("cannot map #{node.type.name} to Ruby object")
+    raise MappingError.new("cannot map #{node.type.name} to Ruby object", cause)
   end
 
 private
@@ -198,54 +204,6 @@ private
         Mapping._obj2soap(child_obj, self, element.type || element.name))
     end
   end
-
-  def any2obj(node, obj_class)
-    unless obj_class
-      typestr = XSD::CodeGen::GenSupport.safeconstname(node.elename.name)
-      obj_class = Mapping.class_from_name(typestr)
-    end
-    if obj_class and obj_class.class_variables.include?('@@schema_element')
-      soap2stubobj(node, obj_class)
-    else
-      Mapping._soap2obj(node, Mapping::DefaultRegistry, obj_class)
-    end
-  end
-
-  def soap2stubobj(node, obj_class)
-    obj = Mapping.create_empty_object(obj_class)
-    unless node.is_a?(SOAPNil)
-      add_elements2stubobj(node, obj)
-    end
-    obj
-  end
-
-  def add_elements2stubobj(node, obj)
-    definition = Mapping.schema_definition_classdef(obj.class)
-    vars = {}
-    node.each do |name, value|
-      item = definition.elements.find { |k, v| k.elename == value.elename }
-      if item and item.mapped_class
-        # klass must be a SOAPBasetype or a class
-        if item.mapped_class.include?(::SOAP::SOAPBasetype)
-          if value.respond_to?(:data)
-            child = item.mapped_class.new(value.data).data
-          else
-            child = item.mapped_class.new(nil).data
-          end
-        else
-          child = Mapping._soap2obj(value, self, item.mapped_class)
-        end
-      else      # untyped element is treated as anyType.
-        child = Mapping._soap2obj(value, self)
-      end
-      if item and item.as_array?
-        (vars[name] ||= []) << child
-      else
-        vars[name] = child
-      end
-    end
-    Mapping.set_attributes(obj, vars)
-  end
 end
 
 

data/lib/soap/mapping/wsdlliteralregistry.rb

@@ -52,10 +52,11 @@ class WSDLLiteralRegistry < LiteralRegistry
 
   # node should be a SOAPElement
   def soap2obj(node, obj_class = nil)
-    # obj_class is given when rpc/literal service.  but ignored for now.
+    cause = nil
     begin
       return any2obj(node, obj_class)
     rescue MappingError
+      cause = $!
     end
     if @excn_handler_soap2obj
       begin
@@ -66,9 +67,9 @@ class WSDLLiteralRegistry < LiteralRegistry
       end
     end
     if node.respond_to?(:type)
-      raise MappingError.new("cannot map #{node.type.name} to Ruby object")
+      raise MappingError.new("cannot map #{node.type.name} to Ruby object", cause)
     else
-      raise MappingError.new("cannot map #{node.elename.name} to Ruby object")
+      raise MappingError.new("cannot map #{node.elename.name} to Ruby object", cause)
     end
   end
 
@@ -103,12 +104,14 @@ private
     ele = nil
     if type.is_a?(::WSDL::XMLSchema::SimpleType)
       ele = simpleobj2soap(obj, type)
-    elsif type.simplecontent
-      ele = simpleobj2soap(obj, type.simplecontent)
-    else
-      ele = complexobj2soap(obj, type)
+    else # complexType
+      if type.simplecontent
+        ele = simpleobj2soap(obj, type.simplecontent)
+      else
+        ele = complexobj2soap(obj, type)
+      end
+      add_definedattributes2soap(obj, ele, type)
     end
-    add_attributes2soap(obj, ele)
     ele
   end
 
@@ -128,58 +131,52 @@ private
 
   def complexobj2soap(obj, type)
     ele = SOAPElement.new(type.name)
-    if type.choice?
-      complexobj2choicesoap(obj, ele, type)
-    else
-      complexobj2sequencesoap(obj, ele, type)
-    end
+    complexobj2sequencesoap(obj, ele, type, type.choice?, type.choice?)
+    ele
   end
 
-  def complexobj2sequencesoap(obj, ele, type)
+  def complexobj2sequencesoap(obj, soap, type, nillable, is_choice)
+    added = false
     type.elements.each do |child_ele|
       case child_ele
       when WSDL::XMLSchema::Any
         any = Mapping.get_attributes_for_any(obj)
         SOAPElement.from_objs(any).each do |child|
-          ele.add(child)
+          soap.add(child)
         end
+        ele_added = true
       when WSDL::XMLSchema::Element
-        complexobj2soapchildren(obj, ele, child_ele)
+        ele_added = complexobj2soapchildren(obj, soap, child_ele, nillable)
       when WSDL::XMLSchema::Sequence
-        complexobj2sequencesoap(obj, child_ele, type)
+        ele_added = complexobj2sequencesoap(obj, soap, child_ele, nillable, false)
       when WSDL::XMLSchema::Choice
-        complexobj2choicesoap(obj, child_ele, type)
+        ele_added = complexobj2sequencesoap(obj, soap, child_ele, true, true)
       else
         raise MappingError.new("unknown type: #{child_ele}")
       end
+      added = true if ele_added
+      break if is_choice and ele_added
     end
-    ele
-  end
-
-  def complexobj2choicesoap(obj, ele, type)
-    type.elements.each do |child_ele|
-      break if complexobj2soapchildren(obj, ele, child_ele, true)
-    end
-    ele
+    added
   end
 
-  def complexobj2soapchildren(obj, ele, child_ele, allow_nil_value = false)
+  def complexobj2soapchildren(obj, soap, child_ele, nillable = false)
     if child_ele.map_as_array?
-      complexobj2soapchildren_array(obj, ele, child_ele, allow_nil_value)
+      complexobj2soapchildren_array(obj, soap, child_ele, nillable)
     else
-      complexobj2soapchildren_single(obj, ele, child_ele, allow_nil_value)
+      complexobj2soapchildren_single(obj, soap, child_ele, nillable)
     end
   end
 
-  def complexobj2soapchildren_array(obj, ele, child_ele, allow_nil_value)
+  def complexobj2soapchildren_array(obj, soap, child_ele, nillable)
     child = Mapping.get_attribute(obj, child_ele.name.name)
     if child.nil? and obj.is_a?(::Array)
       child = obj
     end
     if child.nil?
-      return false if allow_nil_value
+      return false if nillable
       if child_soap = nil2soap(child_ele)
-        ele.add(child_soap)
+        soap.add(child_soap)
         return true
       else
         return false
@@ -190,32 +187,32 @@ private
     end
     child.each do |item|
       if item.is_a?(SOAPElement)
-        ele.add(item)
+        soap.add(item)
       else
         child_soap = obj2elesoap(item, child_ele)
-        ele.add(child_soap)
+        soap.add(child_soap)
       end
     end
     true
   end
 
-  def complexobj2soapchildren_single(obj, ele, child_ele, allow_nil_value)
+  def complexobj2soapchildren_single(obj, soap, child_ele, nillable)
     child = Mapping.get_attribute(obj, child_ele.name.name)
     case child
     when NilClass
-      return false if allow_nil_value
+      return false if nillable
       if child_soap = nil2soap(child_ele)
-        ele.add(child_soap)
+        soap.add(child_soap)
         true
       else
         false
       end
     when SOAPElement
-      ele.add(child)
+      soap.add(child)
       true
     else
       child_soap = obj2elesoap(child, child_ele)
-      ele.add(child_soap)
+      soap.add(child_soap)
       true
     end
   end
@@ -230,6 +227,15 @@ private
       nil
     end
   end
+
+  def add_definedattributes2soap(obj, ele, typedef)
+    if typedef.attributes
+      typedef.attributes.each do |at|
+        value = get_xmlattr_value(obj, at.name)
+        ele.extraattr[at.name] = value unless value.nil?
+      end
+    end
+  end
 end
 
 

data/lib/soap/nestedexception.rb

@@ -0,0 +1,42 @@
+# SOAP4R - Nested exception implementation
+# 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 NestedException
+  attr_reader :cause
+  attr_reader :original_backtraace
+
+  def initialize(msg = nil, cause = nil)
+    super(msg)
+    @cause = cause
+    @original_backtrace = nil
+  end
+
+  def set_backtrace(backtrace)
+    if @cause and @cause.respond_to?(:backtrace)
+      @original_backtrace = backtrace
+=begin
+      # for agressive backtrace abstraction: 'here' only should not be good
+      here = @original_backtrace[0]
+      backtrace = Array[*@cause.backtrace]
+      backtrace[0] = "#{backtrace[0]}: #{@cause} (#{@cause.class})"
+      backtrace.unshift(here)
+=end
+      # just join the nested backtrace at the tail of backtrace
+      caused = Array[*@cause.backtrace]
+      caused[0] = "#{caused[0]}: #{@cause} (#{@cause.class}) [NESTED]"
+      backtrace += caused
+    end
+    super(backtrace)
+  end
+end
+
+
+end