rtiss_soap4r 2.1.0 → 3.0.0.beta

data/lib/soap/rpc/element.rb.orig

@@ -0,0 +1,374 @@
+# SOAP4R - RPC element definition.
+# 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 'soap/baseData'
+require 'soap/rpc/methodDef'
+
+
+module SOAP
+
+# Add method definitions for RPC to common definition in element.rb
+class SOAPBody < SOAPStruct
+  public
+
+  def request
+    root_node
+  end
+
+  def response
+    root = root_node
+    if !@is_fault
+      if root.nil?
+        nil
+      elsif root.is_a?(SOAPBasetype)
+        root
+      else
+        # Initial element is [retval].
+        root[0]
+      end
+    else
+      root
+    end
+  end
+
+  def outparams
+    root = root_node
+    if !@is_fault and !root.nil? and !root.is_a?(SOAPBasetype)
+      op = root[1..-1]
+      op = nil if op && op.empty?
+      op
+    else
+      nil
+    end
+  end
+
+  def fault
+    if @is_fault
+      self['fault']
+    else
+      nil
+    end
+  end
+
+  def fault=(fault)
+    @is_fault = true
+    add('fault', fault)
+  end
+end
+
+
+module RPC
+
+
+class RPCError < Error; end
+class MethodDefinitionError < RPCError; end
+class ParameterError < RPCError; end
+
+class SOAPMethod < SOAPStruct
+  RETVAL = :retval
+  IN = :in
+  OUT = :out
+  INOUT = :inout
+
+  attr_reader :param_def
+  attr_reader :inparam
+  attr_reader :outparam
+  attr_reader :retval_name
+  attr_reader :retval_class_name
+
+  def initialize(qname, param_def = nil)
+    super(nil)
+    @elename = qname
+    @encodingstyle = nil
+
+    @param_def = param_def
+
+    @signature = []
+    @inparam_names = []
+    @inoutparam_names = []
+    @outparam_names = []
+
+    @inparam = {}
+    @outparam = {}
+    @retval_name = nil
+    @retval_class_name = nil
+
+    init_params(@param_def) if @param_def
+  end
+
+  def have_member
+    true
+  end
+
+  def have_outparam?
+    @outparam_names.size > 0
+  end
+
+  def input_params
+    collect_params(IN, INOUT)
+  end
+
+  def output_params
+    collect_params(OUT, INOUT)
+  end
+
+  def input_param_types
+    collect_param_types(IN, INOUT)
+  end
+
+  def output_param_types
+    collect_param_types(OUT, INOUT)
+  end
+
+  def set_param(params)
+    params.each do |param, data|
+      @inparam[param] = data
+      data.elename = XSD::QName.new(data.elename.namespace, param)
+      data.parent = self
+    end
+  end
+
+  def set_outparam(params)
+    params.each do |param, data|
+      @outparam[param] = data
+      data.elename = XSD::QName.new(data.elename.namespace, param)
+    end
+  end
+
+  def get_paramtypes(names)
+    types = []
+    @signature.each do |io_type, name, type_qname|
+      if type_qname && idx = names.index(name)
+        types[idx] = type_qname
+      end
+    end
+    types
+  end
+
+  def SOAPMethod.param_count(param_def, *type)
+    count = 0
+    param_def.each do |param|
+      param = MethodDef.to_param(param)
+      if type.include?(param.io_type.to_sym)
+        count += 1
+      end
+    end
+    count
+  end
+
+  def SOAPMethod.derive_rpc_param_def(obj, name, *param)
+    if param.size == 1 and param[0].is_a?(Array)
+      return param[0]
+    end
+    if param.empty?
+      method = obj.method(name)
+      param_names = (1..method.arity.abs).collect { |i| "p#{i}" }
+    else
+      param_names = param
+    end
+    create_rpc_param_def(param_names)
+  end
+
+  def SOAPMethod.create_rpc_param_def(param_names)
+    param_def = []
+    param_names.each do |param_name|
+      param_def.push([IN, param_name, nil])
+    end
+    param_def.push([RETVAL, 'return', nil])
+    param_def
+  end
+
+  def SOAPMethod.create_doc_param_def(req_qnames, res_qnames)
+    req_qnames = [req_qnames] if req_qnames.is_a?(XSD::QName)
+    res_qnames = [res_qnames] if res_qnames.is_a?(XSD::QName)
+    param_def = []
+    # req_qnames and res_qnames can be nil
+    if req_qnames
+      req_qnames.each do |qname|
+        param_def << [IN, qname.name, [nil, qname.namespace, qname.name]]
+      end
+    end
+    if res_qnames
+      res_qnames.each do |qname|
+        param_def << [OUT, qname.name, [nil, qname.namespace, qname.name]]
+      end
+    end
+    param_def
+  end
+
+private
+
+  def collect_param_types(*type)
+    names = []
+    @signature.each do |io_type, name, type_qname|
+      names << type_qname if type.include?(io_type)
+    end
+    names
+  end
+
+  def collect_params(*type)
+    names = []
+    @signature.each do |io_type, name, type_qname|
+      names << name if type.include?(io_type)
+    end
+    names
+  end
+
+  def init_params(param_def)
+    param_def.each do |param|
+      param = MethodDef.to_param(param)
+      init_param(param)
+    end
+  end
+
+  def init_param(param)
+    mapped_class = SOAPMethod.parse_mapped_class(param.mapped_class)
+    qname = param.qname
+    if qname.nil? and mapped_class
+      qname = TypeMap.index(mapped_class)
+    end
+    case param.io_type
+    when IN
+      @signature.push([IN, param.name, qname])
+      @inparam_names.push(param.name)
+    when OUT
+      @signature.push([OUT, param.name, qname])
+      @outparam_names.push(param.name)
+    when INOUT
+      @signature.push([INOUT, param.name, qname])
+      @inoutparam_names.push(param.name)
+    when RETVAL
+      if @retval_name
+        raise MethodDefinitionError.new('duplicated retval')
+      end
+      @retval_name = param.name
+      @retval_class_name = mapped_class
+    else
+      raise MethodDefinitionError.new("unknown type: #{param.io_type}")
+    end
+  end
+
+  def self.parse_mapped_class(mapped_class)
+    # 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
+  end
+end
+
+
+class SOAPMethodRequest < SOAPMethod
+  attr_accessor :soapaction
+
+  def SOAPMethodRequest.create_request(qname, *params)
+    param_def = []
+    param_value = []
+    i = 0
+    params.each do |param|
+      param_name = "p#{i}"
+      i += 1
+      param_def << [IN, param_name, nil]
+      param_value << [param_name, param]
+    end
+    param_def << [RETVAL, 'return', nil]
+    o = new(qname, param_def)
+    o.set_param(param_value)
+    o
+  end
+
+  def initialize(qname, param_def = nil, soapaction = nil)
+    super(qname, param_def)
+    @soapaction = soapaction
+  end
+
+  def each
+    input_params.each do |name|
+      unless @inparam[name]
+        raise ParameterError.new("parameter: #{name} was not given")
+      end
+      yield(name, @inparam[name])
+    end
+  end
+
+  def dup
+    req = self.class.new(@elename.dup, @param_def, @soapaction)
+    req.encodingstyle = @encodingstyle
+    req
+  end
+
+  def create_method_response(response_name = nil)
+    response_name ||=
+      XSD::QName.new(@elename.namespace, @elename.name + 'Response')
+    SOAPMethodResponse.new(response_name, @param_def)
+  end
+end
+
+
+class SOAPMethodResponse < SOAPMethod
+
+  def initialize(qname, param_def = nil)
+    super(qname, param_def)
+    @retval = nil
+  end
+
+  def retval
+    @retval
+  end
+
+  def retval=(retval)
+    @retval = retval
+    @retval.elename = @retval.elename.dup_name(@retval_name || 'return')
+    retval.parent = self
+    retval
+  end
+
+  def each
+    if @retval_name and !@retval.is_a?(SOAPVoid)
+      yield(@retval_name, @retval)
+    end
+
+    output_params.each do |name|
+      unless @outparam[name]
+        raise ParameterError.new("parameter: #{name} was not given")
+      end
+      yield(name, @outparam[name])
+    end
+  end
+end
+
+
+# To return(?) void explicitly.
+#  def foo(input_var)
+#    ...
+#    return SOAP::RPC::SOAPVoid.new
+#  end
+class SOAPVoid < XSD::XSDAnySimpleType
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  Name = XSD::QName.new(Mapping::RubyCustomTypeNamespace, nil)
+
+public
+  def initialize()
+    @elename = Name
+    @id = nil
+    @precedents = []
+    @parent = nil
+  end
+end
+
+
+end
+end

data/lib/soap/rpc/httpserver.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - WEBrick HTTP Server
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -7,8 +6,7 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'logger'
-require 'logger-application' unless defined?(Logger::Application)
+require 'logger/application'
 require 'soap/attrproxy'
 require 'soap/rpc/soaplet'
 require 'soap/streamHandler'

data/lib/soap/rpc/methodDef.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - A method definition
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/rpc/proxy.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - RPC Proxy library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -149,7 +148,7 @@ public
     if resopt[:generate_explicit_type].nil?
       resopt[:generate_explicit_type] = (op_info.response_use == :encoded)
     end
-    env = route(req_header, req_body, reqopt, resopt, name)
+    env = route(req_header, req_body, reqopt, resopt)
     if op_info.response_use.nil?
       return nil
     end
@@ -191,7 +190,7 @@ public
     begin
       conn_data = @streamhandler.send(@endpoint_url, conn_data)
     rescue Exception => e
-      raise # re-raise the exception
+      raise e # re-raise the exception
     ensure
       dauer_ms = (1000 * (Time.now - start)).round
       http_logger.log(driver_class, method_name, @endpoint_url, conn_data.send_string, conn_data.receive_string, dauer_ms) if http_logger # todo error flag

data/lib/soap/rpc/router.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - RPC Routing library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -84,14 +83,44 @@ class Router
   end
 
   def add_rpc_servant(obj, namespace)
-    ::SOAP::RPC.defined_methods(obj).each do |name|
+    # Get all public instance methods, excluding those inherited from Object
+    # Also include methods from the class's instance methods
+    # This catches methods defined with attr_accessor and similar
+    # Filter out common methods that shouldn't be exposed as SOAP operations
+    methods = (obj.public_methods(false) + obj.class.public_instance_methods(false))
+                .reject { |name| name.to_s =~ /^(initialize|__.*|inspect|to_s|class|object_id)$/ }
+
+    methods.each do |name|
       begin
-        qname = XSD::QName.new(namespace, name)
-        param_def = ::SOAP::RPC::SOAPMethod.derive_rpc_param_def(obj, name)
+        method_name = name.to_s
+        qname = XSD::QName.new(namespace, method_name)
+
+        # Try to derive parameter definitions
+        begin
+          param_def = ::SOAP::RPC::SOAPMethod.derive_rpc_param_def(obj, method_name)
+        rescue SOAP::RPC::MethodDefinitionError => e
+          # If automatic derivation fails, create a generic parameter definition
+          # that accepts any arguments
+          if obj.method(method_name).arity < 0
+            # Variable number of arguments
+            param_def = []
+          else
+            # Fixed number of arguments
+            param_def = Array.new(obj.method(method_name).arity) { |i| ["param#{i}", nil] }
+          end
+        end
+
+        # Create style/use options
         opt = create_styleuse_option(:rpc, :encoded)
-        add_rpc_operation(obj, qname, nil, name, param_def, opt)
-      rescue SOAP::RPC::MethodDefinitionError => e
-        p e if $DEBUG
+        # Add the operation
+        add_rpc_operation(obj, qname, nil, method_name, param_def, opt)
+
+        # Log successful method registration
+        STDERR.puts "Registered method: #{method_name}" if $DEBUG
+      rescue => e
+        # Log errors but don't fail completely
+        STDERR.puts "Failed to register method #{name}: #{e.message}" if $DEBUG
+        STDERR.puts e.backtrace.join("\n") if $DEBUG
       end
     end
   end

data/lib/soap/rpc/rpc.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - RPC utility.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/rpc/soaplet.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP handler servlet for WEBrick
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -9,8 +8,8 @@
 
 require 'webrick/httpservlet/abstract'
 require 'webrick/httpstatus'
-require 'soap/rpc/router'
-require 'soap/streamHandler'
+require_relative 'router'
+require_relative '../streamHandler'
 begin
   require 'stringio'
   require 'zlib'

data/lib/soap/rpc/standaloneServer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - WEBrick Server
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -15,7 +14,7 @@ module RPC
 
 
 class StandaloneServer < HTTPServer
-  def initialize(appname, default_namespace, host = "0.0.0.0", port = 8080)
+  def initialize(appname, default_namespace, host = "0.0.0.0", port = 8089)
     @appname = appname
     @default_namespace = default_namespace
     @host = host

data/lib/soap/soap.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # soap/soap.rb: SOAP4R - Base definitions.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,17 +5,13 @@
 # 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/qname'
-require 'xsd/charset'
-require 'soap/nestedexception'
-require 'soap/version'
+require_relative '../xsd/qname'
+require_relative '../xsd/charset'
+require_relative 'nestedexception'
 
 
 module SOAP
 
-
-Version = SOAP::VERSION::STRING # evaluates to 'SOAP4R-NG 2.0.2' or later
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -99,18 +94,9 @@ class FaultError < Error
   attr_reader :faultactor
   attr_accessor :detail
 
-  def message=(message)
-    @faultmessage = message
-  end
-
   def initialize(fault)
     @faultcode = fault.faultcode
     @faultstring = fault.faultstring
-    if @faultstring and @faultstring.respond_to?('data')
-      @faultmessage = fault.faultstring.data
-    else
-      @faultmessage = nil
-    end
     @faultactor = fault.faultactor
     @detail = fault.detail
     super(self.to_s)
@@ -118,9 +104,7 @@ class FaultError < Error
 
   def to_s
     str = nil
-    if @faultmessage
-      str = @faultmessage.to_s
-    elsif @faultstring and @faultstring.respond_to?('data')
+    if @faultstring and @faultstring.respond_to?('data')
       str = @faultstring.data
     end
     str || '(No faultstring)'
@@ -162,13 +146,3 @@ unless Kernel.respond_to?(:warn)
     end
   end
 end
-
-
-# For Ruby 1.8 and below
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
-end

data/lib/soap/streamHandler.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Stream handler.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,10 +5,13 @@
 # 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
+  Version = "3.0.0"  # Example version number, replace with actual version
+end
 
-require 'soap/soap'
-require 'soap/httpconfigloader'
-require 'soap/filter/filterchain'
+require_relative 'soap'
+require_relative 'httpconfigloader'
+require_relative 'filter/filterchain'
 begin
   require 'stringio'
   require 'zlib'
@@ -56,7 +58,7 @@ class StreamHandler
     end
     charset = $1
     charset.gsub!(/"/, '') if charset
-    charset || 'utf-8'
+    charset || 'us-ascii'
   end
 
   def self.create_media_type(charset)
@@ -143,11 +145,7 @@ public
 
   def initialize(options)
     super()
-		if Client == HTTPClient && SHARED_HTTPCLIENT
-			@client = SHARED_HTTPCLIENT
-		else
-			@client = Client.new(nil, SOAP::VERSION::FORK_STRING)
-		end
+    @client = Client.new(nil, "SOAP4R/#{ Version }")
     if @client.respond_to?(:request_filter)
       @client.request_filter << HttpPostRequestFilter.new(@filterchain)
     end

data/lib/soap/version.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 module SOAP
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 1
+    MAJOR = 3
+    MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta'].join('.')
     
     FORK  = "SOAP4R-NG"
     FORK_STRING = "#{SOAP::VERSION::FORK}/#{SOAP::VERSION::STRING}"

data/lib/soap/wsdlDriver.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP WSDL driver
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,7 +5,6 @@
 # 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 'wsdl/parser'
 require 'wsdl/importer'
 require 'xsd/qname'

data/lib/wsdl/binding.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL binding definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/data.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL data definitions.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/definitions.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL definitions.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/documentation.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL SOAP documentation element.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/import.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL import definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/importer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL importer library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/info.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL information base.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/message.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL message definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.