soap4r 1.5.5.20061022 → 1.5.6

data/lib/soap/mapping/registry.rb

@@ -1,5 +1,5 @@
 # SOAP4R - 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;
@@ -199,11 +199,18 @@ module RegistrySupport
   end
 
   def schema_definition_from_elename(qname)
-    @elename_schema_definition[qname] || find_schema_definition(qname.name)
+    @elename_schema_definition[qname]
   end
 
   def schema_definition_from_type(type)
-    @type_schema_definition[type] || find_schema_definition(type.name)
+    @type_schema_definition[type]
+  end
+
+  def find_node_definition(node)
+    schema_definition_from_type(node.type) ||
+      schema_definition_from_elename(node.elename) ||
+      find_schema_definition(node.elename.name) ||
+      find_schema_definition(node.type.name)
   end
 
   def find_schema_definition(name)
@@ -219,8 +226,7 @@ module RegistrySupport
     definition = Mapping.schema_definition_classdef(obj.class)
     if definition && attributes = definition.attributes
       attributes.each do |qname, param|
-        at = obj.__send__(
-          XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name))
+        at = Mapping.get_attribute(obj, XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name))
         ele.extraattr[qname] = at
       end
     elsif obj.respond_to?(:__xmlattr)
@@ -245,12 +251,23 @@ module RegistrySupport
   end
 
   def base2obj(value, klass)
-    if value.respond_to?(:data)
-      klass.new(value.data).data
+    v = if value.respond_to?(:data)
+          value.data
+        elsif value.respond_to?(:text)
+          value.text
+        else
+          nil
+        end
+    if value.is_a?(klass)
+      v
     else
-      klass.new(nil).data
+      klass.new(v).data
     end
   end
+
+  def is_stubobj_elements_for_array(vars)
+    vars.keys.size == 1 and vars.values[0].is_a?(::Array)
+  end
 end
 
 

data/lib/soap/mapping/rubytypeFactory.rb

@@ -1,5 +1,5 @@
 # SOAP4R - Ruby type mapping factory.
-# Copyright (C) 2000-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/mapping/schemadefinition.rb

@@ -0,0 +1,163 @@
+# SOAP4R - Ruby type mapping schema definition utility.
+# 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/codegen/gensupport'
+
+
+module SOAP
+module Mapping
+
+
+class SchemaElementDefinition
+  attr_reader :varname, :mapped_class, :elename, :minoccurs, :maxoccurs
+
+  def initialize(varname, mapped_class, elename, minoccurs, maxoccurs,
+      as_any, as_array)
+    @varname = varname
+    @mapped_class = mapped_class
+    @elename = elename
+    @minoccurs = minoccurs
+    @maxoccurs = maxoccurs
+    @as_any = as_any
+    @as_array = as_array
+  end
+
+  def as_any?
+    @as_any
+  end
+
+  def as_array?
+    @as_array
+  end
+end
+
+module SchemaComplexTypeDefinition
+  include Enumerable
+
+  def initialize
+    @content = []
+    @element_cache = {}
+  end
+
+  def is_concrete_definition
+    true
+  end
+
+  def <<(ele)
+    @content << ele
+  end
+
+  def each
+    @content.each do |ele|
+      yield ele
+    end
+  end
+
+  def size
+    @content.size
+  end
+
+  def as_any?
+    false
+  end
+
+  def as_array?
+    false
+  end
+
+  def find_element(qname)
+    @element_cache[qname] ||= search_element(qname)
+  end
+
+private
+
+  def search_element(qname)
+    each do |ele|
+      if ele.respond_to?(:find_element)
+        found = ele.find_element(qname)
+        return found if found
+      else
+        # relaxed match
+        if ele.elename == qname or
+            (qname.namespace.nil? and ele.elename.name == qname.name)
+          return ele
+        end
+      end
+    end
+    nil
+  end
+end
+
+class SchemaEmptyDefinition
+  include SchemaComplexTypeDefinition
+
+  def initialize
+    super()
+    @content.freeze
+  end
+end
+
+class SchemaSequenceDefinition
+  include SchemaComplexTypeDefinition
+
+  def initialize
+    super()
+  end
+
+  def choice?
+    false
+  end
+
+  # override
+  def as_array?
+    @as_array ||= false
+  end
+
+  def set_array
+    @as_array = true
+  end
+end
+
+class SchemaChoiceDefinition
+  include SchemaComplexTypeDefinition
+
+  def initialize
+    super()
+  end
+
+  def choice?
+    true
+  end
+end
+
+class SchemaDefinition
+  EMPTY = SchemaEmptyDefinition.new
+
+  attr_reader :class_for
+  attr_reader :elename, :type
+  attr_reader :qualified
+  attr_accessor :attributes
+  attr_accessor :elements
+
+  def initialize(class_for, elename, type, qualified)
+    @class_for = class_for
+    @elename = elename
+    @type = type
+    @qualified = qualified
+    @elements = EMPTY
+    @attributes = nil
+  end
+
+  def choice?
+    @elements.choice?
+  end
+end
+
+
+end
+end

data/lib/soap/mapping/typeMap.rb

@@ -1,5 +1,5 @@
 # SOAP4R - Base type mapping definition
-# Copyright (C) 2000, 2001, 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;
@@ -13,6 +13,9 @@ TypeMap = {
   XSD::XSDAnySimpleType::Type => SOAPAnySimpleType,
 
   XSD::XSDString::Type => SOAPString,
+  XSD::XSDNormalizedString::Type => SOAPNormalizedString,
+  XSD::XSDToken::Type => SOAPToken,
+  XSD::XSDLanguage::Type => SOAPLanguage,
   XSD::XSDBoolean::Type => SOAPBoolean,
   XSD::XSDDecimal::Type => SOAPDecimal,
   XSD::XSDFloat::Type => SOAPFloat,
@@ -46,6 +49,9 @@ TypeMap = {
 
   # soap4r does not use soapenc types actively but it should be accepted.
   SOAP::SOAPString::SOAPENCType => SOAPString,
+  SOAP::SOAPNormalizedString::Type => SOAPNormalizedString,
+  SOAP::SOAPToken::Type => SOAPToken,
+  SOAP::SOAPLanguage::Type => SOAPLanguage,
   SOAP::SOAPBoolean::SOAPENCType => SOAPBoolean,
   SOAP::SOAPDecimal::SOAPENCType => SOAPDecimal,
   SOAP::SOAPFloat::SOAPENCType => SOAPFloat,

data/lib/soap/mapping/wsdlencodedregistry.rb

@@ -1,5 +1,5 @@
 # SOAP4R - WSDL encoded mapping registry.
-# Copyright (C) 2000-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;
@@ -226,7 +226,7 @@ private
       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.ancestors.include?(::SOAP::SOAPBasetype)
+        if item.mapped_class.include?(::SOAP::SOAPBasetype)
           if value.respond_to?(:data)
             child = item.mapped_class.new(value.data).data
           else

data/lib/soap/mapping/wsdlliteralregistry.rb

@@ -1,5 +1,5 @@
 # SOAP4R - WSDL literal mapping registry.
-# Copyright (C) 2004-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;
@@ -77,7 +77,9 @@ private
   def obj2elesoap(obj, eledef)
     ele = nil
     qualified = (eledef.elementform == 'qualified')
-    if eledef.type
+    if obj.is_a?(SOAPNil)
+      ele = obj
+    elsif eledef.type
       if type = @definedtypes[eledef.type]
         ele = obj2typesoap(obj, type)
       elsif type = TypeMap[eledef.type]
@@ -112,7 +114,7 @@ private
 
   def simpleobj2soap(obj, type)
     type.check_lexical_format(obj)
-    return SOAPNil.new if obj.nil?      # TODO: check nillable.
+    return SOAPNil.new if obj.nil?
     if type.base
       ele = base2soap(obj, TypeMap[type.base])
     elsif type.list
@@ -134,18 +136,12 @@ private
   end
 
   def complexobj2sequencesoap(obj, ele, type)
-    elements = type.elements
-    any = nil
-    if type.have_any?
-      any = Mapping.get_attributes_for_any(obj, elements)
-    end
-    elements.each do |child_ele|
+    type.elements.each do |child_ele|
       case child_ele
       when WSDL::XMLSchema::Any
-        if any
-          SOAPElement.from_objs(any).each do |child|
-            ele.add(child)
-          end
+        any = Mapping.get_attributes_for_any(obj)
+        SOAPElement.from_objs(any).each do |child|
+          ele.add(child)
         end
       when WSDL::XMLSchema::Element
         complexobj2soapchildren(obj, ele, child_ele)
@@ -161,13 +157,7 @@ private
   end
 
   def complexobj2choicesoap(obj, ele, type)
-    elements = type.elements
-    any = nil
-    if type.have_any?
-      raise MappingError.new(
-        "<any/> in <choice/> is not supported: #{ele.name.name}")
-    end
-    elements.each do |child_ele|
+    type.elements.each do |child_ele|
       break if complexobj2soapchildren(obj, ele, child_ele, true)
     end
     ele
@@ -183,7 +173,7 @@ private
 
   def complexobj2soapchildren_array(obj, ele, child_ele, allow_nil_value)
     child = Mapping.get_attribute(obj, child_ele.name.name)
-    if child.nil? and obj.respond_to?(:each)
+    if child.nil? and obj.is_a?(::Array)
       child = obj
     end
     if child.nil?
@@ -233,10 +223,11 @@ private
   def nil2soap(ele)
     if ele.nillable
       obj2elesoap(nil, ele)     # add an empty element
-    elsif Integer(ele.minoccurs) == 0
+    elsif ele.minoccurs == 0
       nil       # intends no element
     else
-      raise MappingError.new("nil not allowed: #{ele.name.name}")
+      warn("nil not allowed: #{ele.name.name}")
+      nil
     end
   end
 end

data/lib/soap/mappingRegistry.rb

@@ -1,5 +1,5 @@
 # SOAP4R - RPC utility -- Mapping registry.
-# 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/marshal.rb

@@ -1,5 +1,5 @@
 # SOAP4R - Marshalling/Unmarshalling Ruby's object using SOAP Encoding.
-# Copyright (C) 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;

data/lib/soap/namespace.rb

@@ -1,5 +1,5 @@
 # SOAP4R - Namespace library
-# 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/netHttpClient.rb

@@ -1,5 +1,5 @@
 # SOAP4R - net/http wrapper
-# 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;
@@ -29,19 +29,17 @@ class NetHttpClient
   attr_accessor :connect_timeout
   attr_accessor :send_timeout           # ignored for now.
   attr_accessor :receive_timeout
+  attr_reader :test_loopback_response
 
   def initialize(proxy = nil, agent = nil)
     @proxy = proxy ? URI.parse(proxy) : nil
     @agent = agent
     @debug_dev = nil
+    @test_loopback_response = []
     @session_manager = SessionManager.new
     @no_proxy = @ssl_config = @protocol_version = nil
     @connect_timeout = @send_timeout = @receive_timeout = nil
   end
-
-  def test_loopback_response
-    raise NotImplementedError.new("not supported for now")
-  end
   
   def proxy=(proxy)
     if proxy.nil?
@@ -88,6 +86,9 @@ class NetHttpClient
   end
 
   def get_content(url, header = {})
+    if str = @test_loopback_response.shift
+      return str
+    end
     unless url.is_a?(URI)
       url = URI.parse(url)
     end
@@ -102,12 +103,30 @@ class NetHttpClient
 private
 
   def post_redirect(url, req_body, header, redirect_count)
+    if str = @test_loopback_response.shift
+      if @debug_dev
+        @debug_dev << "= Request\n\n"
+        @debug_dev << req_body
+        @debug_dev << "\n\n= Response\n\n"
+        @debug_dev << str
+      end
+      status = 200
+      reason = nil
+      contenttype = 'text/xml'
+      content = str
+      return Response.new(status, reason, contenttype, content)
+      return str
+    end
     unless url.is_a?(URI)
       url = URI.parse(url)
     end
     extra = header.dup
     extra['User-Agent'] = @agent if @agent
     res = start(url) { |http|
+      if @debug_dev
+        @debug_dev << "= Request\n\n"
+        @debug_dev << req_body << "\n"
+      end
       http.post(url.request_uri, req_body, extra)
     }
     case res
@@ -119,7 +138,7 @@ private
        raise ArgumentError.new("Too many redirects")
       end
     else
-      Response.new(res)
+      Response.from_httpresponse(res)
     end
   end
 
@@ -130,7 +149,10 @@ private
       response = yield(worker)
       worker.finish
     }
-    @debug_dev << response.body if @debug_dev
+    if @debug_dev
+      @debug_dev << "\n\n= Response\n\n"
+      @debug_dev << response.body << "\n"
+    end
     response
   end
 
@@ -186,16 +208,24 @@ private
   end
 
   class Response
-    attr_reader :content
     attr_reader :status
     attr_reader :reason
     attr_reader :contenttype
+    attr_reader :content
+
+    def initialize(status, reason, contenttype, content)
+      @status = status
+      @reason = reason
+      @contenttype = contenttype
+      @content = content
+    end
 
-    def initialize(res)
-      @status = res.code.to_i
-      @reason = res.message
-      @contenttype = res['content-type']
-      @content = res.body
+    def self.from_httpresponse(res)
+      status = res.code.to_i
+      reason = res.message
+      contenttype = res['content-type']
+      content = res.body
+      new(status, reason, contenttype, content)
     end
   end
 end