johnreitano-savon 0.7.2.1 → 0.7.7.1

data/lib/savon/core_ext/net_http.rb

@@ -6,8 +6,7 @@ module Net
       @address, @port = address, port
     end
 
-    # Convenience method for setting SSL client authentication
-    # through a Hash of +options+.
+    # Convenience method for setting SSL client authentication through a Hash of +options+.
     def ssl_client_auth(options)
       self.use_ssl = true
       self.cert = options[:cert] if options[:cert]

data/lib/savon/core_ext/object.rb

@@ -1,8 +1,6 @@
 class Object
 
-  # Returns +true+ if the Object is false, empty, or a whitespace string.
-  # For example, "", false, nil, [], and {} are blank.
-  # Implementation from ActiveSupport.
+  # Returns +true+ if the Object is nil, false or empty. Implementation from ActiveSupport.
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end unless defined? blank?

data/lib/savon/core_ext/string.rb

@@ -26,22 +26,41 @@ class String
     str
   end
 
+  # Returns whether the String starts with a given +prefix+.
+  def starts_with?(prefix)
+    prefix = prefix.to_s
+    self[0, prefix.length] == prefix
+  end unless defined? starts_with?
+
+  # Returns whether the String ends with a given +suffix+.
+  def ends_with?(suffix)
+    suffix = suffix.to_s
+    self[-suffix.length, suffix.length] == suffix
+  end unless defined? ends_with?
+
   # Returns the String without namespace.
   def strip_namespace
-    gsub /(.+:)(.+)/, '\2'
+    split(":").last
   end
 
-  # Translates SOAP response values to more convenient Ruby Objects.
+  # Translates SOAP response values to Ruby Objects.
   def map_soap_response
-    return DateTime.parse( self ) if Savon::SOAPDateTimeRegexp === self
+    return DateTime.parse(self) if Savon::SOAP::DateTimeRegexp === self
     return true if self.strip.downcase == "true"
     return false if self.strip.downcase == "false"
     self
   end
 
   # Returns the String as a SOAP request compliant value.
+  # Escapes special characters for XML.
   def to_soap_value
-    to_s
+    str = dup
+    str.gsub! "&", "&"
+    str.gsub! '"', """
+    str.gsub! "'", "'"
+    str.gsub! "<", "&lt;"
+    str.gsub! ">", "&gt;"
+    str
   end
 
 end

data/lib/savon/core_ext/uri.rb

@@ -1,10 +1,10 @@
 module URI
-  class HTTP
+  class Generic
 
     # Returns whether the URI hints to SSL.
     def ssl?
-      /^https/ === @scheme
+      !@scheme ? nil : @scheme.starts_with?("https")
     end
 
   end
-end
+end

data/lib/savon/logger.rb

@@ -0,0 +1,56 @@
+module Savon
+
+  # = Savon::Logger
+  #
+  # Savon::Logger can be mixed into classes to provide logging behavior.
+  #
+  # By default, the Logger mixin uses {Ruby's Logger}[http://ruby-doc.org/stdlib/libdoc/logger/rdoc/]
+  # from the standard library, a log level of :debug and is pointing to STDOUT.
+  module Logger
+
+    module ClassMethods
+
+      # Sets whether to log.
+      def log=(log)
+        @log = log
+      end
+
+      # Returns whether to log. Defaults to +true+.
+      def log?
+        @log != false
+      end
+
+      # Sets the logger.
+      def logger=(logger)
+        @logger = logger
+      end
+
+      # Returns the logger. Defaults to an instance of +Logger+ writing to STDOUT.
+      def logger
+        @logger ||= ::Logger.new STDOUT
+      end
+
+      # Sets the log level.
+      def log_level=(log_level)
+        @log_level = log_level
+      end
+
+      # Returns the log level. Defaults to +debug+.
+      def log_level
+        @log_level ||= :debug
+      end
+
+    end
+
+    # Extends the class including this module with its ClassMethods.
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    # Logs a given +message+.
+    def log(message)
+      self.class.logger.send self.class.log_level, message if self.class.log?
+    end
+
+  end
+end

data/lib/savon/request.rb

@@ -1,51 +1,50 @@
 module Savon
 
-  # == Savon::Request
+  # = Savon::Request
   #
-  # Handles both WSDL and SOAP HTTP requests.
+  # Savon::Request handles both WSDL and SOAP requests.
+  #
+  # == The Net::HTTP object
+  #
+  # You can access the Net::HTTP object used for both WSDL and SOAP requests via:
+  #
+  #   client.request.http
+  #
+  # Here's an example of how to set open and read timeouts on the Net::HTTP object.
+  #
+  #   client.request.http.open_timeout = 30
+  #   client.request.http.read_timeout = 30
+  #
+  # Please refer to the {Net::HTTP documentation}[http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/]
+  # for more information.
+  #
+  # == HTTP basic authentication
+  #
+  # Setting credentials for HTTP basic authentication:
+  #
+  #   client.request.basic_auth "username", "password"
+  #
+  # == SSL client authentication
+  #
+  # You can use the methods provided by Net::HTTP to set SSL client authentication or use a shortcut:
+  #
+  #   client.request.http.ssl_client_auth(
+  #     :cert => OpenSSL::X509::Certificate.new(File.read("client_cert.pem")),
+  #     :key => OpenSSL::PKey::RSA.new(File.read("client_key.pem"), "password if one exists"),
+  #     :ca_file => "cacert.pem",
+  #     :verify_mode => OpenSSL::SSL::VERIFY_PEER
+  #   )
+  #
+  # == HTTP headers
+  #
+  # There's an accessor for the Hash of HTTP headers sent with any SOAP call:
+  #
+  #   client.request.headers["custom"] = "header"
   class Request
+    include Logger
 
     # Content-Types by SOAP version.
-    ContentType = { 1 => "text/xml", 2 => "application/soap+xml" }
-
-    # Whether to log HTTP requests.
-    @@log = true
-
-    # The default logger.
-    @@logger = Logger.new STDOUT
-
-    # The default log level.
-    @@log_level = :debug
-
-    # Sets whether to log HTTP requests.
-    def self.log=(log)
-      @@log = log
-    end
-
-    # Returns whether to log HTTP requests.
-    def self.log?
-      @@log
-    end
-
-    # Sets the logger.
-    def self.logger=(logger)
-      @@logger = logger
-    end
-
-    # Returns the logger.
-    def self.logger
-      @@logger
-    end
-
-    # Sets the log level.
-    def self.log_level=(log_level)
-      @@log_level = log_level
-    end
-
-    # Returns the log level.
-    def self.log_level
-      @@log_level
-    end
+    ContentType = { 1 => "text/xml;charset=UTF-8", 2 => "application/soap+xml;charset=UTF-8" }
 
     # Expects a SOAP +endpoint+ String. Also accepts an optional Hash
     # of +options+ for specifying a proxy server.
@@ -75,6 +74,12 @@ module Savon
       @basic_auth = [username, password]
     end
 
+    # Sets the +username+ and +password+ for NTLM authentication
+    # if +username+ does not work try 'domain\username'
+    def ntlm_auth(username, password)
+      @ntlm_auth = [username, password]
+    end
+
     # Retrieves WSDL document and returns the Net::HTTP response.
     def wsdl
       log "Retrieving WSDL from: #{@endpoint}"
@@ -83,8 +88,7 @@ module Savon
       http.start { |h| h.request request(:wsdl) }
     end
 
-    # Executes a SOAP request using a given Savon::SOAP instance and
-    # returns the Net::HTTP response.
+    # Executes a SOAP request using a given Savon::SOAP instance and returns the Net::HTTP response.
     def soap(soap)
       @soap = soap
       http.endpoint @soap.endpoint.host, @soap.endpoint.port
@@ -108,7 +112,7 @@ module Savon
     # Logs the SOAP request.
     def log_request
       log "SOAP request: #{@soap.endpoint}"
-      log headers.merge(soap_headers).map { |key, value| "#{key}: #{value}" }.join(", ")
+      log soap_headers.merge(headers).map { |key, value| "#{key}: #{value}" }.join(", ")
       log @soap.to_xml
     end
 
@@ -118,14 +122,21 @@ module Savon
       log @response.body
     end
 
-    # Returns a Net::HTTP request for a given +type+. Yields the request
-    # to an optional block.
+    # Returns a Net::HTTP request for a given +type+. Yields the request to an optional block.
     def request(type)
       request = case type
-        when :wsdl then Net::HTTP::Get.new @endpoint.to_s
-        when :soap then Net::HTTP::Post.new @soap.endpoint.to_s, headers.merge(soap_headers)
+        when :wsdl then Net::HTTP::Get.new @endpoint.request_uri, headers
+        when :soap then Net::HTTP::Post.new @soap.endpoint.request_uri, soap_headers.merge(headers)
+      end
+
+      case
+        when @basic_auth
+          request.basic_auth(*@basic_auth)
+        when @ntlm_auth
+          log "Attempting NTLM Authentication"
+          request.ntlm_auth(*@ntlm_auth)
       end
-      request.basic_auth *@basic_auth if @basic_auth
+      request.basic_auth(*@basic_auth) if @basic_auth
       yield request if block_given?
       request
     end
@@ -135,15 +146,5 @@ module Savon
       { "Content-Type" => ContentType[@soap.version], "SOAPAction" => @soap.action }
     end
 
-    # Logs a given +message+.
-    def log(message)
-      self.class.logger.send self.class.log_level, message if log?
-    end
-
-    # Returns whether to log.
-    def log?
-      self.class.log? && self.class.logger.respond_to?(self.class.log_level)
-    end
-
   end
 end

data/lib/savon/response.rb

@@ -1,10 +1,66 @@
 module Savon
 
-  # == Savon::Response
+  # = Savon::Response
   #
-  # Represents the HTTP and SOAP response.
+  # Savon::Response represents both HTTP and SOAP response.
+  #
+  # == SOAP fault
+  #
+  # Assuming the default behavior of raising errors is disabled, you can ask the response object
+  # if there was a SOAP fault or an HTTP error and get the SOAP fault or HTTP error message.
+  #
+  #   response.soap_fault?
+  #   # => true
+  #
+  #   response.soap_fault
+  #   # => "(soap:Server) Fault occurred while processing."
+  #
+  #   response.http_error?
+  #   # => true
+  #
+  #   response.http_error
+  #   # => "Not found (404)"
+  #
+  # == Response as XML
+  #
+  # To get the raw SOAP response XML, you can call to_xml or to_s on the response object.
+  #
+  #   response.to_xml
+  #   => "<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  #   => "..."
+  #   => "</soap:Envelope>"
+  #
+  # == Response as a Hash
+  #
+  # You can also let Savon translate the SOAP response body to a Hash.
+  #
+  #   response.to_hash
+  #   => { :findUserByIdResponse => {
+  #   =>   :id => "123",
+  #   =>   :username => "eve"
+  #   =>   :active => true
+  #   => }
+  #
+  # When translating the SOAP response to a Hash, some XML tags and values are converted to more
+  # convenient Ruby objects. Translation is done through John Nunemaker's {Crack}[http://github.com/jnunemaker/crack]
+  # library along with some custom mapping.
+  #
+  # * XML tags (Hash keys) are converted to snake_case Symbols and namespaces are stripped off
+  # * SOAP xs:nil values are converted to nil objects
+  # * XML values specified in xs:DateTime format are converted to DateTime objects
+  # * XML values of "true" and "false" are converted to TrueClass and FalseClass
+  #
+  # == Net::HTTP response
+  #
+  # If for some reason you need to access the Net::HTTP response object ... you can.
+  #
+  #   bc. response.http
+  #   => #<Net::HTTPOK:0x7f749a1aa4a8>
   class Response
 
+    # The maximum HTTP response code considered to be OK.
+    MaxNonErrorResponseCode = 299
+
     # The global setting of whether to raise errors.
     @@raise_errors = true
 
@@ -28,7 +84,7 @@ module Savon
 
     # Returns whether there was a SOAP fault.
     def soap_fault?
-      @soap_fault ? true : false
+      !@soap_fault.blank?
     end
 
     # Returns the SOAP fault message.
@@ -36,7 +92,7 @@ module Savon
 
     # Returns whether there was an HTTP error.
     def http_error?
-      @http_error ? true : false
+      !@http_error.blank?
     end
 
     # Returns the HTTP error message.
@@ -54,13 +110,13 @@ module Savon
 
     # Returns the HTTP response object.
     attr_reader :http
-	
+
     alias :to_s :to_xml
 
   private
 
-    # Handles SOAP faults. Raises a Savon::SOAPFault unless the default
-    # behavior of raising errors was turned off.
+    # Handles SOAP faults. Raises a Savon::SOAPFault unless the default behavior of raising errors
+    # was turned off.
     def handle_soap_fault
       if soap_fault_message
         @soap_fault = soap_fault_message
@@ -73,8 +129,8 @@ module Savon
       @soap_fault_message ||= soap_fault_message_by_version to_hash[:fault]
     end
 
-    # Expects a Hash that might contain information about a SOAP fault.
-    # Returns the SOAP fault message in case one was found.
+    # Expects a Hash that might contain information about a SOAP fault. Returns the SOAP fault
+    # message in case one was found.
     def soap_fault_message_by_version(soap_fault)
       return unless soap_fault
 
@@ -85,10 +141,10 @@ module Savon
       end
     end
 
-    # Handles HTTP errors. Raises a Savon::HTTPError unless the default
-    # behavior of raising errors was turned off.
+    # Handles HTTP errors. Raises a Savon::HTTPError unless the default behavior of raising errors
+    # was turned off.
     def handle_http_error
-      if @http.code.to_i >= 300
+      if @http.code.to_i > MaxNonErrorResponseCode
         @http_error = "#{@http.message} (#{@http.code})"
         @http_error << ": #{@http.body}" unless @http.body.empty?
         raise Savon::HTTPError, http_error if self.class.raise_errors?

data/lib/savon/soap.rb

@@ -1,12 +1,125 @@
 module Savon
 
-  # == Savon::SOAP
+  # = Savon::SOAP
   #
-  # Represents the SOAP parameters and envelope.
+  # Savon::SOAP represents the SOAP request. Pass a block to your SOAP call and the SOAP object is
+  # passed to it as the first argument. The object allows setting the SOAP version, header, body
+  # and namespaces per request.
+  #
+  # == Body
+  #
+  # The body method lets you specify parameters to be received by the SOAP action.
+  #
+  # You can either pass in a hash (which will be translated to XML via Hash.to_soap_xml):
+  #
+  #   response = client.get_user_by_id do |soap|
+  #     soap.body = { :id => 123 }
+  #   end
+  #
+  # Or a string containing the raw XML:
+  #
+  #   response = client.get_user_by_id do |soap|
+  #     soap.body = "<id>123</id>"
+  #   end
+  #
+  # Request output:
+  #
+  #   <env:Envelope
+  #       xmlns:wsdl="http://example.com/user/1.0/UserService"
+  #       xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+  #     <env:Body>
+  #       <wsdl:getUserById><id>123</id></wsdl:getUserById>
+  #     </env:Body>
+  #   </env:Envelope>
+  #
+  # Please look at the documentation of Hash.to_soap_xml for some more information.
+  #
+  # == Version
+  #
+  # Savon defaults to SOAP 1.1. In case your service uses SOAP 1.2, you can use the version method
+  # to change the default per request.
+  #
+  #   response = client.get_all_users do |soap|
+  #     soap.version = 2
+  #   end
+  #
+  # You can also change the default to SOAP 1.2 for all request:
+  #
+  #   Savon::SOAP.version = 2
+  #
+  # == Header
+  #
+  # If you need to add custom XML into the SOAP header, you can use the header method.
+  #
+  # The value is expected to be a hash (which will be translated to XML via Hash.to_soap_xml):
+  #
+  #   response = client.get_all_users do |soap|
+  #     soap.header["specialApiKey"] = "secret"
+  #   end
+  #
+  # Or a string containing the raw XML:
+  #
+  #   response = client.get_all_users do |soap|
+  #     soap.header = "<specialApiKey>secret</specialApiKey>"
+  #   end
+  #
+  # Request output:
+  #
+  #   <env:Envelope
+  #       xmlns:wsdl="http://example.com/user/1.0/UserService"
+  #       xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+  #     <env:Header>
+  #       <specialApiKey>secret</specialApiKey>
+  #     </env:Header>
+  #     <env:Body>
+  #       <wsdl:getAllUsers></wsdl:getAllUsers>
+  #     </env:Body>
+  #   </env:Envelope>
+  #
+  # == Namespaces
+  #
+  # The namespaces method contains a hash of attributes for the SOAP envelope. You can overwrite it
+  # or add additional attributes.
+  #
+  #   response = client.get_all_users do |soap|
+  #     soap.namespaces["xmlns:domains"] = "http://domains.example.com"
+  #   end
+  #
+  # Request output:
+  #
+  #   <env:Envelope
+  #       xmlns:wsdl="http://example.com/user/1.0/UserService"
+  #       xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+  #       xmlns:domains="http://domains.example.com">
+  #     <env:Body>
+  #       <wsdl:getAllUsers></wsdl:getAllUsers>
+  #     </env:Body>
+  #   </env:Envelope>
+  #
+  # == Input
+  #
+  # You can change the name of the SOAP input tag in case you need to.
+  #
+  #   response = client.get_all_users do |soap|
+  #     soap.input = "GetAllUsersRequest"
+  #   end
+  #
+  # Request output:
+  #
+  #   <env:Envelope
+  #       xmlns:wsdl="http://example.com/user/1.0/UserService"
+  #       xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+  #     <env:Body>
+  #       <wsdl:GetAllUsersRequest></wsdl:GetAllUsersRequest>
+  #     </env:Body>
+  #   </env:Envelope>
   class SOAP
 
+    # Supported SOAP versions.
+    Versions = [1, 2]
+
     # SOAP namespaces by SOAP version.
-    SOAPNamespace = {
+    Namespace = {
       1 => "http://schemas.xmlsoap.org/soap/envelope/",
       2 => "http://www.w3.org/2003/05/soap-envelope"
     }
@@ -14,6 +127,12 @@ module Savon
     # Content-Types by SOAP version.
     ContentType = { 1 => "text/xml", 2 => "application/soap+xml" }
 
+    # SOAP xs:dateTime format.
+    DateTimeFormat = "%Y-%m-%dT%H:%M:%SZ"
+
+    # SOAP xs:dateTime Regexp.
+    DateTimeRegexp = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
+
     # The global SOAP version.
     @@version = 1
 
@@ -24,11 +143,11 @@ module Savon
 
     # Sets the global SOAP version.
     def self.version=(version)
-      @@version = version if Savon::SOAPVersions.include? version
+      @@version = version if Versions.include? version
     end
 
-    # Sets the global SOAP header. Expected to be a Hash that can be translated
-    # to XML via Hash.to_soap_xml or any other Object responding to to_s.
+    # Sets the global SOAP header. Expected to be a Hash that can be translated to XML via
+    # Hash.to_soap_xml or any other Object responding to to_s.
     def self.header=(header)
       @@header = header
     end
@@ -38,20 +157,22 @@ module Savon
       @@header ||= {}
     end
 
-    # Sets the global namespaces. Expected to be a Hash containing the
-    # namespaces (keys) and the corresponding URI's (values).
+    # Sets the global namespaces. Expected to be a Hash containing the namespaces (keys) and the
+    # corresponding URI's (values).
     def self.namespaces=(namespaces)
       @@namespaces = namespaces if namespaces.kind_of? Hash
     end
 
-    # Returns the global namespaces. A Hash containing the namespaces (keys)
-    # and the corresponding URI's (values).
+    # Returns the global namespaces. A Hash containing the namespaces (keys) and the corresponding
+    # URI's (values).
     def self.namespaces
       @@namespaces ||= {}
     end
 
-    # Initialzes the SOAP object.
-    def initialize
+    # Initialzes the SOAP object. Expects a SOAP +operation+ Hash along with an +endpoint+.
+    def initialize(action, input, endpoint)
+      @action, @input = action, input
+      @endpoint = endpoint.kind_of?(URI) ? endpoint : URI(endpoint)
       @builder = Builder::XmlMarkup.new
     end
 
@@ -77,8 +198,8 @@ module Savon
     # Accessor for the SOAP endpoint.
     attr_accessor :endpoint
 
-    # Sets the SOAP header. Expected to be a Hash that can be translated
-    # to XML via Hash.to_soap_xml or any other Object responding to to_s.
+    # Sets the SOAP header. Expected to be a Hash that can be translated to XML via Hash.to_soap_xml
+    # or any other Object responding to to_s.
     attr_writer :header
 
     # Returns the SOAP header. Defaults to an empty Hash.
@@ -86,28 +207,32 @@ module Savon
       @header ||= {}
     end
 
-    # Sets the SOAP body. Expected to be a Hash that can be translated to
-    # XML via Hash.to_soap_xml or any other Object responding to to_s.
-    attr_writer :body
+    # Accessor for the SOAP body. Expected to be a Hash that can be translated to XML via Hash.to_soap_xml
+    # or any other Object responding to to_s.
+    attr_accessor :body
+
+    # Accessor for overwriting the default SOAP request. Let's you specify completely custom XML.
+    attr_accessor :xml
 
-    # Sets the namespaces. Expected to be a Hash containing the namespaces
-    # (keys) and the corresponding URI's (values).
+    # Sets the namespaces. Expected to be a Hash containing the namespaces (keys) and the
+    # corresponding URI's (values).
     attr_writer :namespaces
 
-    # Returns the namespaces. A Hash containing the namespaces (keys)
-    # and the corresponding URI's (values).
+    # Returns the namespaces. A Hash containing the namespaces (keys) and the corresponding URI's
+    # (values). Defaults to a Hash containing an +xmlns:env+ key and the namespace for the current
+    # SOAP version.
     def namespaces
-      @namespaces ||= { "xmlns:env" => SOAPNamespace[version] }
+      @namespaces ||= { "xmlns:env" => Namespace[version] }
     end
 
-    # Convenience method for setting the "xmlns:wsdl" namespace.
+    # Convenience method for setting the +xmlns:wsdl+ namespace.
     def namespace=(namespace)
       namespaces["xmlns:wsdl"] = namespace
     end
 
     # Sets the SOAP version.
     def version=(version)
-      @version = version if Savon::SOAPVersions.include? version
+      @version = version if Versions.include? version
     end
 
     # Returns the SOAP version. Defaults to the global default.
@@ -117,60 +242,61 @@ module Savon
 
     # Returns the SOAP envelope XML.
     def to_xml
-      unless @xml_body
-        @xml_body = @builder.env :Envelope, all_namespaces do |xml|
-          xml_header xml
+      unless @xml
+        @builder.instruct!
+        @xml = @builder.env :Envelope, merged_namespaces do |xml|
+          xml.env(:Header) { xml << merged_header } unless merged_header.empty?
           xml_body xml
         end
       end
-      @xml_body
+      @xml
     end
 
   private
 
-    # Adds a SOAP XML header to a given +xml+ Object.
-    def xml_header(xml)
-      xml.env(:Header) do
-        xml << all_header + wsse_header
-      end
-    end
-
     # Returns a String containing the global and per request header.
-    def all_header
+    def merged_header
       if self.class.header.kind_of?(Hash) && header.kind_of?(Hash)
-        self.class.header.merge(header).to_soap_xml
+        merged_header = self.class.header.merge(header).to_soap_xml
       else
-        self.class.header.to_s + header.to_s
+        global_header = self.class.header.to_soap_xml rescue self.class.header.to_s
+        request_header = header.to_soap_xml rescue header.to_s
+        merged_header = global_header + request_header
       end
+      merged_header + wsse_header
+    end
+
+    # Returns the WSSE header or an empty String in case WSSE was not set.
+    def wsse_header
+      @wsse.respond_to?(:header) ? @wsse.header : ""
     end
 
     # Adds a SOAP XML body to a given +xml+ Object.
     def xml_body(xml)
       xml.env(:Body) do
-        xml.tag!(:wsdl, *input_array) do
-          xml << (@body.to_soap_xml rescue @body.to_s)
-        end
+        xml.tag!(:wsdl, *input_array) { xml << (@body.to_soap_xml rescue @body.to_s) }
       end
     end
 
     # Returns a Hash containing the global and per request namespaces.
-    def all_namespaces
+    def merged_namespaces
       self.class.namespaces.merge namespaces
     end
 
-    # Returns an Array of SOAP input names to append to the :wsdl namespace.
-    # Defaults to use the name of the SOAP action and may be an empty Array
-    # in case the specified SOAP input seems invalid.
+    # Returns an Array of SOAP input names to append to the wsdl namespace. Defaults to use the
+    # name of the SOAP action. May return an empty Array in case the specified SOAP input seems
+    # to be invalid.
     def input_array
-      return [input.to_sym] unless input.blank?
-      return [action.to_sym] unless action.blank?
-      []
-    end
-
-    # Returns the WSSE header or an empty String in case WSSE was not set.
-    def wsse_header
-      @wsse.respond_to?(:header) ? @wsse.header : ""
+      if input.kind_of?(Array) && !input.blank?
+        [input[0].to_sym, input[1]]
+      elsif !input.blank?
+        [input.to_sym]
+      elsif !action.blank?
+        [action.to_sym]
+      else
+        []
+      end
     end
 
   end
-end
+end