rtiss_soap4r 2.1.1 → 3.0.0.beta

data/lib/soap/rpc/driver.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP RPC driver
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -19,207 +18,207 @@ require 'soap/header/handlerset'
 
 
 module SOAP
-module RPC
-
-
-class Driver
-  include AttrProxy
-
-  attr_proxy :endpoint_url, true
-  attr_proxy :mapping_registry, true
-  attr_proxy :literal_mapping_registry, true
-  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
-  attr_proxy :streamhandler
-  attr_proxy :test_loopback_response
-  attr_proxy :reset_stream
-
-  attr_reader :proxy
-  attr_reader :options
-  attr_accessor :soapaction
-
-  class << self
-    # http logger should be set once on initialization
-    # It should be a subclass of SOAP::HttpLogger, for example:
-    # SPA::RPC::Driver.http_logger = SOAP::SimpleHttpLogger.new
-    def http_logger
-      @@http_logger ||= nil
-    end
+  module RPC
+
+
+    class Driver
+      include AttrProxy
+
+      attr_proxy :endpoint_url, true
+      attr_proxy :mapping_registry, true
+      attr_proxy :literal_mapping_registry, true
+      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
+      attr_proxy :streamhandler
+      attr_proxy :test_loopback_response
+      attr_proxy :reset_stream
+
+      attr_reader :proxy
+      attr_reader :options
+      attr_accessor :soapaction
+
+      class << self
+        # http logger should be set once on initialization
+        # It should be a subclass of SOAP::HttpLogger, for example:
+        # SPA::RPC::Driver.http_logger = SOAP::SimpleHttpLogger.new
+        def http_logger
+          @@http_logger ||= nil
+        end
 
-    def http_logger=(http_logger)
-      @@http_logger = http_logger
-    end
-  end
+        def http_logger=(http_logger)
+          @@http_logger = http_logger
+        end
+      end
 
-  def inspect
-    "#<#{self.class}:#{@proxy.inspect}>"
-  end
+      def inspect
+        "#<#{self.class}:#{@proxy.inspect}>"
+      end
 
-  def httpproxy
-    options["protocol.http.proxy"]
-  end
+      def httpproxy
+        options["protocol.http.proxy"]
+      end
 
-  def httpproxy=(httpproxy)
-    options["protocol.http.proxy"] = httpproxy
-  end
+      def httpproxy=(httpproxy)
+        options["protocol.http.proxy"] = httpproxy
+      end
 
-  def wiredump_dev
-    options["protocol.http.wiredump_dev"]
-  end
+      def wiredump_dev
+        options["protocol.http.wiredump_dev"]
+      end
 
-  def wiredump_dev=(wiredump_dev)
-    options["protocol.http.wiredump_dev"] = wiredump_dev
-  end
+      def wiredump_dev=(wiredump_dev)
+        options["protocol.http.wiredump_dev"] = wiredump_dev
+      end
 
-  def mandatorycharset
-    options["protocol.mandatorycharset"]
-  end
+      def mandatorycharset
+        options["protocol.mandatorycharset"]
+      end
 
-  def mandatorycharset=(mandatorycharset)
-    options["protocol.mandatorycharset"] = mandatorycharset
-  end
+      def mandatorycharset=(mandatorycharset)
+        options["protocol.mandatorycharset"] = mandatorycharset
+      end
 
-  def wiredump_file_base
-    options["protocol.wiredump_file_base"]
-  end
+      def wiredump_file_base
+        options["protocol.wiredump_file_base"]
+      end
 
-  def wiredump_file_base=(wiredump_file_base)
-    options["protocol.wiredump_file_base"] = wiredump_file_base
-  end
+      def wiredump_file_base=(wiredump_file_base)
+        options["protocol.wiredump_file_base"] = wiredump_file_base
+      end
 
-  def initialize(endpoint_url, namespace = nil, soapaction = nil)
-    @namespace = namespace
-    @soapaction = soapaction
-    @options = setup_options
-    @wiredump_file_base = nil
-    @proxy = Proxy.new(endpoint_url, @soapaction, @options)
-    @proxy.driver_class = self.class
-    @proxy.http_logger = self.class.http_logger
-  end
+      def initialize(endpoint_url, namespace = nil, soapaction = nil)
+        @namespace = namespace
+        @soapaction = soapaction
+        @options = setup_options
+        @wiredump_file_base = nil
+        @proxy = Proxy.new(endpoint_url, @soapaction, @options)
+        @proxy.driver_class = self.class
+        @proxy.http_logger = self.class.http_logger
+      end
 
-  def loadproperty(propertyname)
-    unless options.loadproperty(propertyname)
-      raise LoadError.new("No such property to load -- #{propertyname}")
-    end
-  end
+      def loadproperty(propertyname)
+        unless options.loadproperty(propertyname)
+          raise LoadError.new("No such property to load -- #{propertyname}")
+        end
+      end
 
-  def add_rpc_method(name, *params)
-    add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
-  end
+      def add_rpc_method(name, *params)
+        add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
+      end
 
-  def add_rpc_method_as(name, name_as, *params)
-    add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
-  end
+      def add_rpc_method_as(name, name_as, *params)
+        add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
+      end
 
-  def add_rpc_method_with_soapaction(name, soapaction, *params)
-    add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
-  end
+      def add_rpc_method_with_soapaction(name, soapaction, *params)
+        add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
+      end
 
-  def add_rpc_method_with_soapaction_as(name, name_as, soapaction, *params)
-    param_def = SOAPMethod.create_rpc_param_def(params)
-    qname = XSD::QName.new(@namespace, name_as)
-    @proxy.add_rpc_method(qname, soapaction, name, param_def)
-    add_rpc_method_interface(name, param_def)
-  end
+      def add_rpc_method_with_soapaction_as(name, name_as, soapaction, *params)
+        param_def = SOAPMethod.create_rpc_param_def(params)
+        qname = XSD::QName.new(@namespace, name_as)
+        @proxy.add_rpc_method(qname, soapaction, name, param_def)
+        add_rpc_method_interface(name, param_def)
+      end
 
-  # add_method is for shortcut of typical rpc/encoded method definition.
-  alias add_method add_rpc_method
-  alias add_method_as add_rpc_method_as
-  alias add_method_with_soapaction add_rpc_method_with_soapaction
-  alias add_method_with_soapaction_as add_rpc_method_with_soapaction_as
+      # add_method is for shortcut of typical rpc/encoded method definition.
+      alias add_method add_rpc_method
+      alias add_method_as add_rpc_method_as
+      alias add_method_with_soapaction add_rpc_method_with_soapaction
+      alias add_method_with_soapaction_as add_rpc_method_with_soapaction_as
 
-  def add_document_method(name, soapaction, req_qname, res_qname)
-    param_def = SOAPMethod.create_doc_param_def(req_qname, res_qname)
-    @proxy.add_document_method(soapaction, name, param_def)
-    add_document_method_interface(name, param_def)
-  end
+      def add_document_method(name, soapaction, req_qname, res_qname)
+        param_def = SOAPMethod.create_doc_param_def(req_qname, res_qname)
+        @proxy.add_document_method(soapaction, name, param_def)
+        add_document_method_interface(name, param_def)
+      end
 
-  def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
-    @proxy.add_rpc_operation(qname, soapaction, name, param_def, opt)
-    add_rpc_method_interface(name, param_def)
-  end
+      def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
+        @proxy.add_rpc_operation(qname, soapaction, name, param_def, opt)
+        add_rpc_method_interface(name, param_def)
+      end
 
-  def add_document_operation(soapaction, name, param_def, opt = {})
-    @proxy.add_document_operation(soapaction, name, param_def, opt)
-    add_document_method_interface(name, param_def)
-  end
+      def add_document_operation(soapaction, name, param_def, opt = {})
+        @proxy.add_document_operation(soapaction, name, param_def, opt)
+        add_document_method_interface(name, param_def)
+      end
 
-  def invoke(headers, body)
-    if headers and !headers.is_a?(SOAPHeader)
-      headers = create_header(headers)
-    end
-    set_wiredump_file_base(body.elename.name)
-    env = @proxy.invoke(headers, body)
-    if env.nil?
-      return nil, nil
-    else
-      return env.header, env.body
-    end
-  end
+      def invoke(headers, body)
+        if headers and !headers.is_a?(SOAPHeader)
+          headers = create_header(headers)
+        end
+        set_wiredump_file_base(body.elename.name)
+        env = @proxy.invoke(headers, body)
+        if env.nil?
+          return nil, nil
+        else
+          return env.header, env.body
+        end
+      end
 
-  def call(name, *params)
-    set_wiredump_file_base(name)
-    @proxy.call(name, *params)
-  end
+      def call(name, *params)
+        set_wiredump_file_base(name)
+        @proxy.call(name, *params)
+      end
 
-private
+      private
 
-  def attrproxy
-    @proxy
-  end
+      def attrproxy
+        @proxy
+      end
 
-  def set_wiredump_file_base(name)
-    if @wiredump_file_base
-      @proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
-    end
-  end
+      def set_wiredump_file_base(name)
+        if @wiredump_file_base
+          @proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
+        end
+      end
 
-  def create_header(headers)
-    header = SOAPHeader.new()
-    headers.each do |content, mustunderstand, encodingstyle|
-      header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
-    end
-    header
-  end
+      def create_header(headers)
+        header = SOAPHeader.new
+        headers.each do |content, mustunderstand, encodingstyle|
+          header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
+        end
+        header
+      end
 
-  def setup_options
-    if opt = Property.loadproperty(::SOAP::PropertyName)
-      opt = opt["client"]
-    end
-    opt ||= Property.new
-    opt.add_hook("protocol.mandatorycharset") do |key, value|
-      @proxy.mandatorycharset = value
-    end
-    opt.add_hook("protocol.wiredump_file_base") do |key, value|
-      @wiredump_file_base = value
-    end
-    opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
-    opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
-    opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
-    opt
-  end
+      def setup_options
+        if opt = Property.loadproperty(::SOAP::PropertyName)
+          opt = opt["client"]
+        end
+        opt ||= Property.new
+        opt.add_hook("protocol.mandatorycharset") do |key, value|
+          @proxy.mandatorycharset = value
+        end
+        opt.add_hook("protocol.wiredump_file_base") do |key, value|
+          @wiredump_file_base = value
+        end
+        opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
+        opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
+        opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
+        opt
+      end
 
-  def add_rpc_method_interface(name, param_def)
-    param_count = RPC::SOAPMethod.param_count(param_def,
-      RPC::SOAPMethod::IN, RPC::SOAPMethod::INOUT)
-    add_method_interface(name, param_count)
-  end
+      def add_rpc_method_interface(name, param_def)
+        param_count = RPC::SOAPMethod.param_count(param_def,
+                                                  RPC::SOAPMethod::IN, RPC::SOAPMethod::INOUT)
+        add_method_interface(name, param_count)
+      end
 
-  def add_document_method_interface(name, param_def)
-    param_count = RPC::SOAPMethod.param_count(param_def, RPC::SOAPMethod::IN)
-    add_method_interface(name, param_count)
-  end
+      def add_document_method_interface(name, param_def)
+        param_count = RPC::SOAPMethod.param_count(param_def, RPC::SOAPMethod::IN)
+        add_method_interface(name, param_count)
+      end
 
-  # Mapping.define_singleton_method calls define_method with proc and it
-  # exhausts much memory for each singleton Object.  just instance_eval instead
-  # of it.
-  def add_method_interface(name, param_count)
-    instance_eval <<-EOS
+      # Mapping.define_singleton_method calls define_method with proc and it
+      # exhausts much memory for each singleton Object.  just instance_eval instead
+      # of it.
+      def add_method_interface(name, param_count)
+        instance_eval <<-EOS
       def #{name}(*arg)
         unless arg.size == #{param_count}
           raise ArgumentError.new(
@@ -228,10 +227,10 @@ private
         call(#{name.dump}, *arg)
       end
     EOS
-    self.method(name)
-  end
-end
+        self.method(name)
+      end
+    end
 
 
-end
+  end
 end

data/lib/soap/rpc/element.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - RPC element definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -231,7 +230,7 @@ private
     mapped_class = SOAPMethod.parse_mapped_class(param.mapped_class)
     qname = param.qname
     if qname.nil? and mapped_class
-      qname = TypeMap.respond_to?(:key) ? TypeMap.key(mapped_class) : TypeMap.index(mapped_class) # RubyJedi: compatible with Ruby 1.8.6 and above 
+      qname = TypeMap.key(mapped_class)
     end
     case param.io_type
     when IN
@@ -362,7 +361,7 @@ class SOAPVoid < XSD::XSDAnySimpleType
   Name = XSD::QName.new(Mapping::RubyCustomTypeNamespace, nil)
 
 public
-  def initialize()
+  def initialize
     @elename = Name
     @id = nil
     @precedents = []