rtiss_soap4r 1.6.1 → 2.0.4

data/lib/soap/proxy.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - Proxy library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/rpc/cgistub.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - CGI/mod_ruby stub library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -11,6 +11,7 @@ require 'soap/streamHandler'
 require 'webrick/httpresponse'
 require 'webrick/httpstatus'
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 require 'soap/rpc/soaplet'
 
 

data/lib/soap/rpc/driver.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP RPC driver
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -43,6 +43,19 @@ class Driver
   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 inspect
     "#<#{self.class}:#{@proxy.inspect}>"
   end
@@ -85,6 +98,8 @@ class Driver
     @options = setup_options
     @wiredump_file_base = nil
     @proxy = Proxy.new(endpoint_url, @soapaction, @options)
+    @proxy.driver_class = self.class
+    @proxy.http_logger = self.http_logger
   end
 
   def loadproperty(propertyname)

data/lib/soap/rpc/element.rb

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

data/lib/soap/rpc/httpserver.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - WEBrick HTTP Server
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -8,6 +8,7 @@
 
 
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 require 'soap/attrproxy'
 require 'soap/rpc/soaplet'
 require 'soap/streamHandler'

data/lib/soap/rpc/methodDef.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - RPC Proxy library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -41,6 +41,8 @@ public
 
   attr_accessor :mapping_registry
   attr_accessor :literal_mapping_registry
+  attr_accessor :driver_class
+  attr_accessor :http_logger
 
   attr_reader :operation
 
@@ -147,7 +149,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)
+    env = route(req_header, req_body, reqopt, resopt, name)
     if op_info.response_use.nil?
       return nil
     end
@@ -166,7 +168,7 @@ public
     end
   end
 
-  def route(req_header, req_body, reqopt, resopt)
+  def route(req_header, req_body, reqopt, resopt, method_name = nil)
     req_env = ::SOAP::SOAPEnvelope.new(req_header, req_body)
     unless reqopt[:envelopenamespace].nil?
       set_envelopenamespace(req_env, reqopt[:envelopenamespace])
@@ -184,7 +186,17 @@ public
       conn_data.send_contenttype = mime.headers['content-type'].str
     end
     conn_data.soapaction = reqopt[:soapaction]
-    conn_data = @streamhandler.send(@endpoint_url, conn_data)
+
+    start = Time.now
+    begin
+      conn_data = @streamhandler.send(@endpoint_url, conn_data)
+    rescue Exception => e
+      raise # 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
+    end
+
     if conn_data.receive_string.empty?
       return nil
     end

data/lib/soap/rpc/router.rb

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

data/lib/soap/rpc/rpc.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP handler servlet for WEBrick
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/rpc/standaloneServer.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - WEBrick Server
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/soap.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # soap/soap.rb: SOAP4R - Base definitions.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -16,8 +16,7 @@ require 'soap/version'
 module SOAP
 
 
-# VERSION = Version = SOAP::VERSION::STRING # '1.5.8-HEAD'
-Version = SOAP::VERSION::STRING # '1.5.8-HEAD'
+Version = SOAP::VERSION::STRING # evaluates to 'SOAP4R-NG 2.0.2' or later
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -100,9 +99,18 @@ 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)
@@ -110,7 +118,9 @@ class FaultError < Error
 
   def to_s
     str = nil
-    if @faultstring and @faultstring.respond_to?('data')
+    if @faultmessage
+      str = @faultmessage.to_s
+    elsif @faultstring and @faultstring.respond_to?('data')
       str = @faultstring.data
     end
     str || '(No faultstring)'
@@ -152,3 +162,13 @@ 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - Stream handler.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -56,7 +56,7 @@ class StreamHandler
     end
     charset = $1
     charset.gsub!(/"/, '') if charset
-    charset || 'us-ascii'
+    charset || 'utf-8'
   end
 
   def self.create_media_type(charset)
@@ -146,7 +146,7 @@ public
 		if Client == HTTPClient && SHARED_HTTPCLIENT
 			@client = SHARED_HTTPCLIENT
 		else
-			@client = Client.new(nil, "RUBYJEDI-SOAP4R/#{ Version }")
+			@client = Client.new(nil, SOAP::VERSION::FORK_STRING)
 		end
     if @client.respond_to?(:request_filter)
       @client.request_filter << HttpPostRequestFilter.new(@filterchain)

data/lib/soap/version.rb

@@ -1,9 +1,12 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 module SOAP
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 6
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 4
     STRING = [MAJOR, MINOR, TINY].join('.')
+    
+    FORK  = "SOAP4R-NG"
+    FORK_STRING = "#{SOAP::VERSION::FORK}/#{SOAP::VERSION::STRING}"
   end
 end

data/lib/soap/wsdlDriver.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP WSDL driver
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/binding.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - WSDL definitions.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/documentation.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - WSDL message definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/operation.rb

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

data/lib/wsdl/operationBinding.rb

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

data/lib/wsdl/param.rb

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

data/lib/wsdl/parser.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - WSDL XML Instance parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -138,7 +138,9 @@ private
       o.root = parent.root
       o.parent = parent if o.parent.nil?
     end
-    attrs.each do |key, value|
+    to_array_and_splice_name_to_first(attrs).each do |attr|
+      key = attr[:key]
+      value = attr[:value]
       attr_ele = ns.parse(key, true)
       value_ele = ns.parse(value, false)
       value_ele.source = value  # for recovery; value may not be a QName
@@ -159,6 +161,19 @@ private
   def decode_text(ns, text)
     @textbuf << text
   end
+
+  def to_array_and_splice_name_to_first(attrs)
+    attrs_name = []
+    attrs_other = []
+    attrs.each do |key, value|
+      if key == "name"
+        attrs_name << { :key => key, :value => value }
+      elsif
+        attrs_other << { :key => key, :value => value }
+      end
+    end
+    attrs_name.concat(attrs_other)
+  end
 end
 
 

data/lib/wsdl/part.rb

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

data/lib/wsdl/port.rb

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

data/lib/wsdl/portType.rb

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

data/lib/wsdl/service.rb

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

data/lib/wsdl/soap/address.rb

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

data/lib/wsdl/soap/binding.rb

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

data/lib/wsdl/soap/body.rb

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

data/lib/wsdl/soap/cgiStubCreator.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - Creating CGI stub code from WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/soap/classDefCreator.rb

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

data/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - Creating class code support from WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.