savon 2.2.0 → 2.12.1

data/lib/savon/qualified_message.rb

@@ -2,44 +2,50 @@ require "gyoku"
 
 module Savon
   class QualifiedMessage
-
     def initialize(types, used_namespaces, key_converter)
-      @types = types
+      @types           = types
       @used_namespaces = used_namespaces
-      @key_converter = key_converter
+      @key_converter   = key_converter
     end
 
     def to_hash(hash, path)
-      return unless hash
-      return hash.map { |value| to_hash(value, path) } if hash.kind_of?(Array)
-      return hash.to_s unless hash.kind_of? Hash
-
-      hash.inject({}) do |newhash, (key, value)|
-        translated_key = Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
-        newpath = path + [translated_key]
-
-        if @used_namespaces[newpath]
-          newhash.merge(
-            "#{@used_namespaces[newpath]}:#{translated_key}" =>
-              to_hash(value, @types[newpath] ? [@types[newpath]] : newpath)
-          )
+      return hash unless hash
+      return hash.map { |value| to_hash(value, path) } if hash.is_a?(Array)
+      return hash.to_s unless hash.is_a?(Hash)
+
+      hash.each_with_object({}) do |(key, value), newhash|
+        case key
+        when :order!
+          newhash[key] = add_namespaces_to_values(value, path)
+        when :attributes!, :content!
+          newhash[key] = to_hash(value, path)
         else
-          add_namespaces_to_values(value, path) if key == :order!
-          newhash.merge(key => value)
+          if key.to_s =~ /!$/
+            newhash[key] = value
+          else
+            translated_key  = translate_tag(key)
+            newkey          = add_namespaces_to_values(key, path).first
+            newpath         = path + [translated_key]
+            newhash[newkey] = to_hash(value, @types[newpath] ? [@types[newpath]] : newpath)
+          end
         end
+        newhash
       end
     end
 
     private
 
-    def add_namespaces_to_values(values, path)
-      values.collect! { |value|
-        camelcased_value = Gyoku.xml_tag(value, :key_converter => @key_converter)
-        namespace_path = path + [camelcased_value.to_s]
-        namespace = @used_namespaces[namespace_path]
-        "#{namespace.blank? ? '' : namespace + ":"}#{camelcased_value}"
-      }
+    def translate_tag(key)
+      Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
     end
 
+    def add_namespaces_to_values(values, path)
+      Array(values).collect do |value|
+        translated_value = translate_tag(value)
+        namespace_path   = path + [translated_value]
+        namespace        = @used_namespaces[namespace_path]
+        namespace.blank? ? value : "#{namespace}:#{translated_value}"
+      end
+    end
   end
 end

data/lib/savon/request.rb

@@ -26,10 +26,16 @@ module Savon
     def configure_ssl
       @http_request.auth.ssl.ssl_version   = @globals[:ssl_version]       if @globals.include? :ssl_version
       @http_request.auth.ssl.verify_mode   = @globals[:ssl_verify_mode]   if @globals.include? :ssl_verify_mode
+      @http_request.auth.ssl.ciphers       = @globals[:ssl_ciphers]       if @globals.include? :ssl_ciphers
 
       @http_request.auth.ssl.cert_key_file = @globals[:ssl_cert_key_file] if @globals.include? :ssl_cert_key_file
+      @http_request.auth.ssl.cert_key      = @globals[:ssl_cert_key]      if @globals.include? :ssl_cert_key
       @http_request.auth.ssl.cert_file     = @globals[:ssl_cert_file]     if @globals.include? :ssl_cert_file
+      @http_request.auth.ssl.cert          = @globals[:ssl_cert]          if @globals.include? :ssl_cert
       @http_request.auth.ssl.ca_cert_file  = @globals[:ssl_ca_cert_file]  if @globals.include? :ssl_ca_cert_file
+      @http_request.auth.ssl.ca_cert_path  = @globals[:ssl_ca_cert_path]  if @globals.include? :ssl_ca_cert_path
+      @http_request.auth.ssl.ca_cert       = @globals[:ssl_ca_cert]       if @globals.include? :ssl_ca_cert
+      @http_request.auth.ssl.cert_store    = @globals[:ssl_cert_store]    if @globals.include? :ssl_cert_store
 
       @http_request.auth.ssl.cert_key_password = @globals[:ssl_cert_key_password] if @globals.include? :ssl_cert_key_password
     end
@@ -37,8 +43,14 @@ module Savon
     def configure_auth
       @http_request.auth.basic(*@globals[:basic_auth])   if @globals.include? :basic_auth
       @http_request.auth.digest(*@globals[:digest_auth]) if @globals.include? :digest_auth
+      @http_request.auth.ntlm(*@globals[:ntlm])          if @globals.include? :ntlm
     end
 
+    def configure_redirect_handling
+      if @globals.include? :follow_redirects
+        @http_request.follow_redirect = @globals[:follow_redirects]
+      end
+    end
   end
 
   class WSDLRequest < HTTPRequest
@@ -46,12 +58,19 @@ module Savon
     def build
       configure_proxy
       configure_timeouts
+      configure_headers
       configure_ssl
       configure_auth
+      configure_redirect_handling
 
       @http_request
     end
 
+    private
+
+    def configure_headers
+      @http_request.headers = @globals[:headers] if @globals.include? :headers
+    end
   end
 
   class SOAPRequest < HTTPRequest
@@ -63,11 +82,12 @@ module Savon
 
     def build(options = {})
       configure_proxy
-      configure_cookies options[:cookies]
       configure_timeouts
-      configure_headers options[:soap_action]
+      configure_headers options[:soap_action], options[:headers]
+      configure_cookies options[:cookies]
       configure_ssl
       configure_auth
+      configure_redirect_handling
 
       @http_request
     end
@@ -78,11 +98,11 @@ module Savon
       @http_request.set_cookies(cookies) if cookies
     end
 
-    def configure_headers(soap_action)
+    def configure_headers(soap_action, headers)
       @http_request.headers = @globals[:headers] if @globals.include? :headers
+      @http_request.headers.merge!(headers) if headers
       @http_request.headers["SOAPAction"]   ||= %{"#{soap_action}"} if soap_action
       @http_request.headers["Content-Type"] ||= CONTENT_TYPE[@globals[:soap_version]] % @globals[:encoding]
     end
-
   end
 end

data/lib/savon/request_logger.rb

@@ -0,0 +1,48 @@
+require "savon/log_message"
+
+module Savon
+  class RequestLogger
+
+    def initialize(globals)
+      @globals = globals
+    end
+
+    def log(request, &http_request)
+      log_request(request) if log?
+      response = http_request.call
+      log_response(response) if log?
+
+      response
+    end
+
+    def logger
+      @globals[:logger]
+    end
+
+    def log?
+      @globals[:log]
+    end
+
+    private
+
+    def log_request(request)
+      logger.info  { "SOAP request: #{request.url}" }
+      logger.info  { headers_to_log(request.headers) }
+      logger.debug { body_to_log(request.body) }
+    end
+
+    def log_response(response)
+      logger.info  { "SOAP response (status #{response.code})" }
+      logger.debug { body_to_log(response.body) }
+    end
+
+    def headers_to_log(headers)
+      headers.map { |key, value| "#{key}: #{value}" }.join(", ")
+    end
+
+    def body_to_log(body)
+      LogMessage.new(body, @globals[:filters], @globals[:pretty_print_xml]).to_s
+    end
+
+  end
+end

data/lib/savon/response.rb

@@ -10,18 +10,19 @@ module Savon
       @globals = globals
       @locals  = locals
 
+      build_soap_and_http_errors!
       raise_soap_and_http_errors! if @globals[:raise_errors]
     end
 
-    attr_reader :http, :globals, :locals
+    attr_reader :http, :globals, :locals, :soap_fault, :http_error
 
     def success?
       !soap_fault? && !http_error?
     end
-    alias successful? success?
+    alias_method :successful?, :success?
 
     def soap_fault?
-      SOAPFault.present? @http
+      SOAPFault.present?(@http, xml)
     end
 
     def http_error?
@@ -29,15 +30,14 @@ module Savon
     end
 
     def header
-      raise_invalid_response_error! unless hash.key? :envelope
-      hash[:envelope][:header]
+      find('Header')
     end
 
     def body
-      raise_invalid_response_error! unless hash.key? :envelope
-      hash[:envelope][:body]
+      find('Body')
     end
-    alias to_hash body
+
+    alias_method :to_hash, :body
 
     def to_array(*path)
       result = path.inject body do |memo, key|
@@ -49,30 +49,45 @@ module Savon
     end
 
     def hash
-      @hash ||= nori.parse(to_xml)
+      @hash ||= nori.parse(xml)
     end
 
-    def to_xml
+    def xml
       @http.body
     end
 
+    alias_method :to_xml, :xml
+    alias_method :to_s,   :xml
+
     def doc
-      @doc ||= Nokogiri.XML(to_xml)
+      @doc ||= Nokogiri.XML(xml)
     end
 
     def xpath(path, namespaces = nil)
       doc.xpath(path, namespaces || xml_namespaces)
     end
 
+    def find(*path)
+      envelope = nori.find(hash, 'Envelope')
+      raise_invalid_response_error! unless envelope.is_a?(Hash)
+
+      nori.find(envelope, *path)
+    end
+
     private
 
+    def build_soap_and_http_errors!
+      @soap_fault = SOAPFault.new(@http, nori, xml) if soap_fault?
+      @http_error = HTTPError.new(@http) if http_error?
+    end
+
     def raise_soap_and_http_errors!
-      raise SOAPFault.new(@http, nori) if soap_fault?
-      raise HTTPError.new(@http) if http_error?
+      raise soap_fault if soap_fault?
+      raise http_error if http_error?
     end
 
     def raise_invalid_response_error!
-      raise InvalidResponseError, "Unable to parse response body:\n" + to_xml.inspect
+      raise InvalidResponseError, "Unable to parse response body:\n" + xml.inspect
     end
 
     def xml_namespaces
@@ -83,10 +98,12 @@ module Savon
       return @nori if @nori
 
       nori_options = {
-        :strip_namespaces     => @globals[:strip_namespaces],
-        :convert_tags_to      => @globals[:convert_response_tags_to],
-        :advanced_typecasting => @locals[:advanced_typecasting],
-        :parser               => @locals[:response_parser]
+        :delete_namespace_attributes => @globals[:delete_namespace_attributes],
+        :strip_namespaces            => @globals[:strip_namespaces],
+        :convert_tags_to             => @globals[:convert_response_tags_to],
+        :convert_attributes_to       => @globals[:convert_attributes_to],
+        :advanced_typecasting        => @locals[:advanced_typecasting],
+        :parser                      => @locals[:response_parser]
       }
 
       non_nil_nori_options = nori_options.reject { |_, value| value.nil? }

data/lib/savon/soap_fault.rb

@@ -1,31 +1,31 @@
-require "savon"
-
 module Savon
   class SOAPFault < Error
 
-    def self.present?(http)
-      fault_node  = http.body.include?("Fault>")
-      soap1_fault = http.body.include?("faultcode>") && http.body.include?("faultstring>")
-      soap2_fault = http.body.include?("Code>") && http.body.include?("Reason>")
+    def self.present?(http, xml = nil)
+      xml ||= http.body
+      fault_node  = xml.include?("Fault>")
+      soap1_fault = xml.match(/faultcode\/?\>/) && xml.match(/faultstring\/?\>/)
+      soap2_fault = xml.include?("Code>") && xml.include?("Reason>")
 
       fault_node && (soap1_fault || soap2_fault)
     end
 
-    def initialize(http, nori)
+    def initialize(http, nori, xml = nil)
+      @xml = xml
       @http = http
       @nori = nori
     end
 
-    attr_reader :http, :nori
+    attr_reader :http, :nori, :xml
 
     def to_s
-      fault = nori.find(to_hash, 'Fault')
+      fault = nori.find(to_hash, 'Fault') || nori.find(to_hash, 'ServiceFault')
       message_by_version(fault)
     end
 
     def to_hash
-      parsed = nori.parse(@http.body)
-      nori.find(parsed, 'Envelope', 'Body')
+      parsed = nori.parse(xml || http.body)
+      nori.find(parsed, 'Envelope', 'Body') || {}
     end
 
     private

data/lib/savon/version.rb

@@ -1,5 +1,3 @@
 module Savon
-
-  VERSION = "2.2.0"
-
+  VERSION = '2.12.1'
 end

data/savon.gemspec

@@ -12,24 +12,25 @@ Gem::Specification.new do |s|
   s.homepage    = "http://savonrb.com"
   s.summary     = "Heavy metal SOAP client"
   s.description = s.summary
+  s.required_ruby_version = '>= 1.9.2'
 
   s.rubyforge_project = s.name
+  s.license = 'MIT'
 
-  s.add_dependency "nori",     "~> 2.1.0"
-  s.add_dependency "httpi",    "~> 2.0.2"
-  s.add_dependency "wasabi",   "~> 3.1.0"
-  s.add_dependency "akami",    "~> 1.2.0"
-  s.add_dependency "gyoku",    "~> 1.0.0"
-
+  s.add_dependency "nori",     "~> 2.4"
+  s.add_dependency "httpi",    "~> 2.3"
+  s.add_dependency "wasabi",   "~> 3.4"
+  s.add_dependency "akami",    "~> 1.2"
+  s.add_dependency "gyoku",    "~> 1.2"
   s.add_dependency "builder",  ">= 2.1.2"
-  s.add_dependency "nokogiri", ">= 1.4.0"
+  s.add_dependency "nokogiri", ">= 1.8.1"
 
   s.add_development_dependency "rack"
-  s.add_development_dependency "puma",  "2.0.0.b4"
+  s.add_development_dependency "puma",  "~> 3.0"
 
-  s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.10"
-  s.add_development_dependency "mocha", "~> 0.11"
+  s.add_development_dependency "rake",  "~> 10.1"
+  s.add_development_dependency "rspec", "~> 2.14"
+  s.add_development_dependency "mocha", "~> 0.14"
   s.add_development_dependency "json",  "~> 1.7"
 
   ignores  = File.readlines(".gitignore").grep(/\S+/).map(&:chomp)

data/spec/fixtures/response/empty_soap_fault.xml

@@ -0,0 +1,13 @@
+<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <SOAP-ENV:Body>
+    <SOAP-ENV:Fault>
+      <faultcode/>
+      <faultstring/>
+      <detail><soapVal><ERRNO xsi:type="xsd:string">80:1289245853:55</ERRNO></soapVal></detail>
+    </SOAP-ENV:Fault>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>

data/spec/fixtures/response/f5.xml

@@ -0,0 +1,39 @@
+<E:Envelope
+        xmlns:E="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:A="http://schemas.xmlsoap.org/soap/encoding/"
+        xmlns:s="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:y="http://www.w3.org/2001/XMLSchema"
+        xmlns:iControl="urn:iControl"
+        E:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+<E:Body>
+<m:get_agent_listen_addressResponse
+        xmlns:m="urn:iControl:Management/SNMPConfiguration">
+<return
+        s:type="A:Array"
+        A:arrayType="iControl:Management.SNMPConfiguration.AgentListenAddressPort[2]">
+<item>
+<transport
+        s:type="iControl:Management.SNMPConfiguration.TransportType">TRANSPORT_TCP6</transport>
+<ipport
+        s:type="iControl:Common.IPPortDefinition">
+<address
+        s:type="y:string"></address>
+<port
+        s:type="y:long">161</port>
+</ipport>
+</item>
+<item>
+<transport
+        s:type="iControl:Management.SNMPConfiguration.TransportType">TRANSPORT_UDP6</transport>
+<ipport
+        s:type="iControl:Common.IPPortDefinition">
+<address
+        s:type="y:string"></address>
+<port
+        s:type="y:long">161</port>
+</ipport>
+</item>
+</return>
+</m:get_agent_listen_addressResponse>
+</E:Body>
+</E:Envelope>