soap4r 1.5.6 → 1.5.7

data/lib/soap/soap.rb

@@ -13,7 +13,7 @@ require 'xsd/charset'
 module SOAP
 
 
-VERSION = Version = '1.5.6'
+VERSION = Version = '1.5.7'
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -119,9 +119,9 @@ module Env
     ENV[name.downcase] || ENV[name.upcase]
   end
 
-  use_proxy = getenv('soap_use_proxy') == 'on'
-  HTTP_PROXY = use_proxy ? getenv('http_proxy') : nil
-  NO_PROXY = use_proxy ? getenv('no_proxy') : nil
+  is_cgi = !getenv('request_method').nil?
+  HTTP_PROXY = is_cgi ? getenv('cgi_http_proxy') : getenv('http_proxy')
+  NO_PROXY = getenv('no_proxy')
 end
 
 

data/lib/soap/streamHandler.rb

@@ -8,6 +8,7 @@
 
 require 'soap/soap'
 require 'soap/httpconfigloader'
+require 'soap/filter/filterchain'
 begin
   require 'stringio'
   require 'zlib'
@@ -22,6 +23,8 @@ module SOAP
 class StreamHandler
   RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
 
+  attr_reader :filterchain
+
   class ConnectionData
     attr_accessor :send_string
     attr_accessor :send_contenttype
@@ -42,6 +45,10 @@ class StreamHandler
     end
   end
 
+  def initialize
+    @filterchain = Filter::FilterChain.new
+  end
+
   def self.parse_media_type(str)
     if /^#{ MediaType }(?:\s*;\s*charset=([^"]+|"[^"]+"))?$/i !~ str
       return nil
@@ -55,13 +62,13 @@ class StreamHandler
     "#{ MediaType }; charset=#{ charset }"
   end
 
-  def send(endpoint_url, conn_data, soapaction = nil, charset = nil)
-    # send a ConnectionData to specified endpoint_url.
+  def send(url, conn_data, soapaction = nil, charset = nil)
+    # send a ConnectionData to specified url.
     # return value is a ConnectionData with receive_* property filled.
     # You can fill values of given conn_data and return it.
   end
 
-  def reset(endpoint_url = nil)
+  def reset(url = nil)
     # for initializing connection status if needed.
     # return value is not expected.
   end
@@ -85,19 +92,42 @@ class HTTPStreamHandler < StreamHandler
   include SOAP
 
   begin
-    require 'http-access2'
-    if HTTPAccess2::VERSION < "2.0"
-      raise LoadError.new("http-access/2.0 or later is required.")
-    end
-    Client = HTTPAccess2::Client
+    require 'httpclient'
+    Client = HTTPClient
     RETRYABLE = true
   rescue LoadError
-    warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
-    require 'soap/netHttpClient'
-    Client = SOAP::NetHttpClient
-    RETRYABLE = false
+    begin
+      require 'http-access2'
+      if HTTPAccess2::VERSION < "2.0"
+        raise LoadError.new("http-access/2.0 or later is required.")
+      end
+      Client = HTTPAccess2::Client
+      RETRYABLE = true
+    rescue LoadError
+      warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
+      require 'soap/netHttpClient'
+      Client = SOAP::NetHttpClient
+      RETRYABLE = false
+    end
   end
 
+  class HttpPostRequestFilter
+    def initialize(filterchain)
+      @filterchain = filterchain
+    end
+
+    def filter_request(req)
+      @filterchain.each do |filter|
+        filter.on_http_outbound(req)
+      end
+    end
+
+    def filter_response(req, res)
+      @filterchain.each do |filter|
+        filter.on_http_inbound(req, res)
+      end
+    end
+  end
 
 public
   
@@ -113,6 +143,9 @@ public
   def initialize(options)
     super()
     @client = Client.new(nil, "SOAP4R/#{ Version }")
+    if @client.respond_to?(:request_filter)
+      @client.request_filter << HttpPostRequestFilter.new(@filterchain)
+    end
     @wiredump_file_base = nil
     @charset = @wiredump_dev = nil
     @options = options
@@ -134,18 +167,18 @@ public
     "#<#{self.class}>"
   end
 
-  def send(endpoint_url, conn_data, soapaction = nil, charset = @charset)
+  def send(url, conn_data, soapaction = nil, charset = @charset)
     conn_data.soapaction ||= soapaction # for backward conpatibility
-    conn_data = send_post(endpoint_url, conn_data, charset)
+    conn_data = send_post(url, conn_data, charset)
     @client.save_cookie_store if @cookie_store
     conn_data
   end
 
-  def reset(endpoint_url = nil)
-    if endpoint_url.nil?
+  def reset(url = nil)
+    if url.nil?
       @client.reset_all
     else
-      @client.reset(endpoint_url)
+      @client.reset(url)
     end
     @client.save_cookie_store if @cookie_store
   end
@@ -170,9 +203,11 @@ private
     end
     ssl_config = @options["http.ssl_config"]
     basic_auth = @options["http.basic_auth"]
+    auth = @options["http.auth"]
     @options["http"].lock(true)
     ssl_config.unlock
     basic_auth.unlock
+    auth.unlock
   end
 
   def set_cookie_store_file(value)
@@ -181,7 +216,7 @@ private
     @client.set_cookie_store(@cookie_store) if @cookie_store
   end
 
-  def send_post(endpoint_url, conn_data, charset)
+  def send_post(url, conn_data, charset)
     conn_data.send_contenttype ||= StreamHandler.create_media_type(charset)
 
     if @wiredump_file_base
@@ -191,29 +226,29 @@ private
       f.close
     end
 
-    extra = {}
-    extra['Content-Type'] = conn_data.send_contenttype
-    extra['SOAPAction'] = "\"#{ conn_data.soapaction }\""
-    extra['Accept-Encoding'] = 'gzip' if send_accept_encoding_gzip?
+    extheader = {}
+    extheader['Content-Type'] = conn_data.send_contenttype
+    extheader['SOAPAction'] = "\"#{ conn_data.soapaction }\""
+    extheader['Accept-Encoding'] = 'gzip' if send_accept_encoding_gzip?
     send_string = conn_data.send_string
     @wiredump_dev << "Wire dump:\n\n" if @wiredump_dev
     begin
       retry_count = 0
       while true
-        res = @client.post(endpoint_url, send_string, extra)
+        res = @client.post(url, send_string, extheader)
         if RETRYABLE and HTTP::Status.redirect?(res.status)
           retry_count += 1
           if retry_count >= MAX_RETRY_COUNT
             raise HTTPStreamError.new("redirect count exceeded")
           end
-          endpoint_url = res.header["location"][0]
-          puts "redirected to #{endpoint_url}" if $DEBUG
+          url = res.header["location"][0]
+          puts "redirected to #{url}" if $DEBUG
         else
           break
         end
       end
     rescue
-      @client.reset(endpoint_url)
+      @client.reset(url)
       raise
     end
     @wiredump_dev << "\n\n" if @wiredump_dev

data/lib/wsdl/soap/classDefCreator.rb

@@ -84,6 +84,8 @@ private
         dump_complextypedef(ele.name, ele.local_complextype, qualified)
       elsif ele.local_simpletype
         dump_simpletypedef(ele.name, ele.local_simpletype, qualified)
+      elsif ele.empty?
+        dump_simpleclassdef(ele.name, nil)
       else
         nil
       end
@@ -198,7 +200,7 @@ private
     c = ClassDef.new(classname, '::String')
     c.comment = "#{qname}"
     init_lines = []
-    unless type_or_element.attributes.empty?
+    if type_or_element and !type_or_element.attributes.empty?
       define_attribute(c, type_or_element.attributes)
       init_lines << "@__xmlattr = {}"
     end
@@ -363,7 +365,7 @@ private
   end
 
   def check_classname(classname)
-    if @modulepath.nil? and Module.constants.include?(classname)
+    if @modulepath.nil? and Object.constants.include?(classname)
       warn("created definition re-opens an existing toplevel class: #{classname}")
     end
   end

data/lib/wsdl/soap/literalMappingRegistryCreator.rb

@@ -160,8 +160,13 @@ private
     child_element = typedef.find_aryelement
     if child_type == XSD::AnyTypeName
       type = nil
-    elsif child_element and (klass = element_basetype(child_element))
-      type = klass.name
+    elsif child_element
+      if klass = element_basetype(child_element)
+        type = klass.name
+      else
+        typename = child_element.type || child_element.name
+        type = create_class_name(typename, @modulepath)
+      end
     elsif child_type
       type = create_class_name(child_type, @modulepath)
     else

data/lib/wsdl/soap/mappingRegistryCreator.rb

@@ -38,11 +38,9 @@ class MappingRegistryCreator
     m = XSD::CodeGen::ModuleDef.new(module_name)
     m.def_require("soap/mapping")
     varname = 'EncodedRegistry'
-    methodname = 'define_encoded_mapping'
     m.def_const(varname, '::SOAP::Mapping::EncodedRegistry.new')
     m.def_code(encoded_creator.dump(varname))
     varname = 'LiteralRegistry'
-    methodname = 'define_literal_mapping'
     m.def_const(varname, '::SOAP::Mapping::LiteralRegistry.new')
     m.def_code(literal_creator.dump(varname))
     m.dump

data/lib/wsdl/soap/mappingRegistryCreatorSupport.rb

@@ -78,6 +78,8 @@ module MappingRegistryCreatorSupport
       when XMLSchema::Element
         if element.type == XSD::AnyTypeName
           type = nil
+        elsif @simpletypes[element.type]
+          type = create_class_name(element.type, @modulepath)
         elsif klass = element_basetype(element)
           type = klass.name
         elsif element.type

data/lib/wsdl/soap/methodDefCreator.rb

@@ -161,15 +161,18 @@ __EOD__
       when :TYPE_STRUCT, :TYPE_EMPTY    # ToDo: empty should be treated as void.
         type = create_class_name(part.type, @modulepath)
 	[type, part.type.namespace, part.type.name]
-      when :TYPE_MAP
-	[Hash.name, part.type.namespace, part.type.name]
       when :TYPE_ARRAY
 	arytype = definedtype.find_arytype || XSD::AnyTypeName
 	arytypename = arytype.name.sub(/\[(?:,)*\]$/, '')
         arytypedef = create_class_name(XSD::QName.new(nil, arytypename), @modulepath)
 	[arytypedef + '[]', part.type.namespace, part.type.name]
+      when :TYPE_SIMPLE
+        type = create_class_name(part.type, @modulepath)
+	[type, part.type.namespace, part.type.name]
+      when :TYPE_MAP
+	[Hash.name, part.type.namespace, part.type.name]
       else
-	raise NotImplementedError.new("must not reach here")
+	raise NotImplementedError.new("must not reach here: #{definedtype.compoundtype}")
       end
     elsif part.type == XSD::AnyTypeName
       [nil]

data/lib/wsdl/xmlSchema/element.rb

@@ -69,6 +69,10 @@ class Element < Info
     @refelement = nil
   end
 
+  def empty?
+    !(local_simpletype || local_complextype || constraint || type)
+  end
+
   def refelement
     @refelement ||= (@ref ? root.collect_elements[@ref] : nil)
   end

data/lib/wsdl/xmlSchema/importer.rb

@@ -6,6 +6,7 @@
 # either the dual license version in 2003, or any later version.
 
 
+require 'soap/soap'
 require 'soap/httpconfigloader'
 require 'wsdl/xmlSchema/parser'
 
@@ -15,6 +16,8 @@ module XMLSchema
 
 
 class Importer
+  DO_NOT_IMPORT = [::SOAP::EncodingNamespace]
+
   def self.import(location, originalroot = nil)
     new.import(location, originalroot)
   end
@@ -24,6 +27,9 @@ class Importer
   end
 
   def import(location, originalroot = nil)
+    if DO_NOT_IMPORT.include?(location.to_s)
+      return nil
+    end
     unless location.is_a?(URI)
       location = URI.parse(location)
     end
@@ -70,17 +76,23 @@ private
   end
 
   def web_client
-    @web_client ||= begin
-	require 'http-access2'
-	if HTTPAccess2::VERSION < "2.0"
-	  raise LoadError.new("http-access/2.0 or later is required.")
-	end
-	HTTPAccess2::Client
+    return @web_client if @web_client
+    begin
+      require 'httpclient'
+      @web_client = HTTPClient
+    rescue LoadError
+      begin
+        require 'http-access2'
+        if HTTPAccess2::VERSION < "2.0"
+          raise LoadError.new("http-access/2.0 or later is required.")
+        end
+        @web_client = HTTPAccess2::Client
       rescue LoadError
-	warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
-	require 'soap/netHttpClient'
-	::SOAP::NetHttpClient
+        warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
+        require 'soap/netHttpClient'
+        @web_client = ::SOAP::NetHttpClient
       end
+    end
     @web_client
   end
 end

data/lib/wsdl/xmlSchema/xsd2ruby.rb

@@ -9,6 +9,8 @@
 require 'xsd/codegen/gensupport'
 require 'wsdl/xmlSchema/importer'
 require 'wsdl/soap/classDefCreator'
+require 'wsdl/soap/literalMappingRegistryCreator'
+require 'logger'
 
 
 module WSDL
@@ -26,7 +28,7 @@ class XSD2Ruby
       raise RuntimeError, "XML Schema location not given"
     end
     @xsd = import(@location)
-    @name = create_classname(@xsd)
+    @name = @opt['classdef'] || create_classname(@xsd)
     create_file
   end
 
@@ -42,7 +44,10 @@ private
   end
 
   def create_file
-    create_classdef
+    @modulepath = @opt['module_path']
+    create_classdef if @opt.key?('classdef')
+    create_mapping_registry if @opt.key?('mapping_registry')
+    create_mapper if @opt.key?('mapper')
   end
 
   def create_classdef
@@ -50,10 +55,58 @@ private
     @classdef_filename = @name + '.rb'
     check_file(@classdef_filename) or return
     write_file(@classdef_filename) do |f|
-      f << WSDL::SOAP::ClassDefCreator.new(@xsd).dump
+      f << WSDL::SOAP::ClassDefCreator.new(@xsd, @modulepath).dump
     end
   end
 
+  def create_mapping_registry
+    @logger.info { "Creating mapping registry definition." }
+    @mr_filename = @name + '_mapping_registry.rb'
+    check_file(@mr_filename) or return
+    write_file(@mr_filename) do |f|
+      f << dump_mapping_registry
+    end
+  end
+
+  def create_mapper
+    @logger.info { "Creating mapper definition." }
+    @mapper_filename = @name + '_mapper.rb'
+    check_file(@mapper_filename) or return
+    write_file(@mapper_filename) do |f|
+      f << dump_mapper
+    end
+  end
+
+  def dump_mapping_registry
+    creator = WSDL::SOAP::LiteralMappingRegistryCreator.new(@xsd, @modulepath)
+    module_name = XSD::CodeGen::GenSupport.safeconstname(
+      @name + 'MappingRegistry')
+    if @modulepath
+      module_name = [@modulepath, module_name].join('::')
+    end
+    m = XSD::CodeGen::ModuleDef.new(module_name)
+    m.def_require("xsd/mapping")
+    m.def_require("#{@classdef_filename}")
+    varname = 'Registry'
+    m.def_const(varname, '::SOAP::Mapping::LiteralRegistry.new')
+    m.def_code(creator.dump(varname))
+    m.dump
+  end
+
+  def dump_mapper
+    class_name = XSD::CodeGen::GenSupport.safeconstname(@name + 'Mapper')
+    if @modulepath
+      class_name = [@modulepath, class_name].join('::')
+    end
+    mr_name = XSD::CodeGen::GenSupport.safeconstname(@name + 'MappingRegistry')
+    c = XSD::CodeGen::ClassDef.new(class_name, 'XSD::Mapping::Mapper')
+    c.def_require("#{@mr_filename}")
+    c.def_method("initialize") do
+      "super(#{mr_name}::Registry)"
+    end
+    c.dump
+  end
+
   def write_file(filename)
     if @basedir
       filename = File.join(basedir, filename)