savon 2.15.0 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9290bcf944e220b16f3273b19e85a8e0a7aaeb2d87d41dc21abbc339c515d7f
-  data.tar.gz: 291db78a5977bb23de3672367b9bba2a750f609f855aabac56fffdabafb07bf2
+  metadata.gz: 3f58a5268715a082369bc199231506447defea5f760fae67cb51507a9011836c
+  data.tar.gz: d349d7d546fb236e45f433047bd575dd6f6ec206254707094f02420ec58dfc07
 SHA512:
-  metadata.gz: b0f201223113366550455242e6ecafb265596150d695f3c406070b4d233b7be36eb5a70e2cdd49f9bf16572369b9a5f2fa4669470308684d83e0fd88e1fb2505
-  data.tar.gz: 9aabf5fc3f73585a8eb5bce033b028bab32530ef126b02435fb83ee441f2d09f4a20b05972d6a915474408a88335a9ba557b58c3c27ae58c397f881bc3541378
+  metadata.gz: 91d6cd948edbb82b643fa5aaeef265dcfeef5037459478f0815f01bdacbe04cb159165301a9f0ebc75fd897470ff2a0b51de1fa256123843698a14925f5ebf43
+  data.tar.gz: 3a9fe95352e4f85e9e88f7eaffba5fb04df58085380ed7c62e8c0f31c0b110b5127c494125f373e97489c789991b6c1271e68df000606c3e1a3311a17edc951a

data/CHANGELOG.md

@@ -3,9 +3,30 @@
 ## Unreleased
 * Add your PR changelog line here
 
+## 3.0.0.rc1 (2024-07-15)
+
+* Use Faraday instead of HTTPI
+* BC BREAKING Cookies are handled differently now
+* BC BREAKING Multiple pieces of functionality will rely on faraday libraries to be provided by the consuming codebase
+* BC BREAKING Adapter overrides now utilize the faraday model
+* BC BREAKING Multiple hard deprecations due to a lack of feature parity between Faraday and HTTPI
+  * Deprecates digest auth
+  * Deprecates ssl_cert_key_file auth, upgrade path is to read the key
+    in and provide it
+  * Deprecates encrypted ssl keys, upgrade path is to
+    decrypt the key and pass it to faraday in code
+  * Deprecates providing a ca cert, upgrade path is to provide a ca cert file
+  * deprecates overriding ssl ciphers, as faraday does not support this
+
+## 2.15.1 (2024-07-08)
+
+* Ruby 3.0+ is required in the gemspec.
+* Require httpi 4.x - older versions rely on `Rack::Utils::HeaderHash` which is removed in Rack 3.0.
+
 ## 2.15.0 (2024-02-10)
 
 * Drop support for ruby 2.7 and below. Added Ruby 3.2 and 3.3 to test matrix.
+* Allows wasabi v5.x, which now supports faraday
 
 ## 2.14.0 (2022-12-16)
 
@@ -16,6 +37,7 @@
 ## 2.13.1 (2022-09-04)
 
 * Fix: [#977](https://github.com/savonrb/savon/pull/977) Prevent "xmlns:xmlns" namespace but allow "xmlns" namespace.
+* Change: Require Ruby 2.7.0+ in the gemspec. [0e0d695f](https://github.com/savonrb/savon/commit/0e0d695f463b719fa0fef0f58a0404b1228957f0)
 
 ## 2.13.0 (2022-08-03)
 
@@ -535,7 +557,7 @@ Combined release ticket: [#481](https://github.com/savonrb/savon/issues/481)
 
   * `Hash#map_soap_response` and some of its helpers are moved to [Nori v1.0.0](http://rubygems.org/gems/nori/versions/1.0.0).
     Along with replacing core extensions with a proper implementation, Nori now contains a number of methods
-    for [configuring its default behavior](https://github.com/savonrb/nori/blob/master/CHANGELOG.md):
+    for [configuring its default behavior](https://github.com/savonrb/nori/blob/main/CHANGELOG.md):
 
       * The option whether to strip namespaces was moved to Nori.strip_namespaces
       * You can disable "advanced typecasting" for SOAP response values

data/README.md

@@ -10,10 +10,11 @@ Heavy metal SOAP client
 [![Code Climate](https://codeclimate.com/github/savonrb/savon.svg)](https://codeclimate.com/github/savonrb/savon)
 [![Coverage Status](https://coveralls.io/repos/savonrb/savon/badge.svg)](https://coveralls.io/r/savonrb/savon)
 
+If you're reading this on GitHub, note that this README is for the main branch and that features/changes described here might not correspond to your version. You can find the documentation for your release [at rubydoc.info](https://www.rubydoc.info/find/gems?q=savon).
 
-## Version 2
+## Installation
 
-Savon version 2 is available through [Rubygems](http://rubygems.org/gems/savon) and can be installed via:
+Savon is available through [Rubygems](http://rubygems.org/gems/savon) and can be installed via:
 
 ```
 $ gem install savon
@@ -22,7 +23,7 @@ $ gem install savon
 or add it to your Gemfile like this:
 
 ```
-gem 'savon', '~> 2.13.0'
+gem 'savon', '~> 3.0.0'
 ```
 
 ## Usage example
@@ -52,14 +53,24 @@ response.body
 For more examples, you should check out the
 [integration tests](https://github.com/savonrb/savon/tree/version2/spec/integration).
 
+## Upgrading from v2.x to v3.x
+
+See [UPGRADING.md](UPGRADING.md) for more information.
+
 ## Ruby version support
 
-* `master` - MRI 2.7, 3.0, 3.1 (same support as Ruby)
+Every savon release is tested with contemporary supported versions of ruby. Historical compatibility information:
+
+* `main` - same support as Ruby
+* 2.15.x - MRI 3.0, 3.1, 3.2, 3.3
+* 2.13.x, 2.14.x - MRI 2.7, 3.0, 3.1
 * 2.12.x - MRI 2.2, 2.3, 2.4, 2.5
 * 2.11.x - MRI 2.0, 2.1, 2.2, and 2.3
 
 If you are running MRI 1.8.7, try a 2.6.x release.
 
+Most changes are not backported to older versions of savon, or unsupported ruby versions.
+
 ## Running tests
 
 ```bash

data/lib/savon/http_error.rb

@@ -4,7 +4,7 @@ module Savon
   class HTTPError < Error
 
     def self.present?(http)
-      http.error?
+      !http.success?
     end
 
     def initialize(http)
@@ -14,13 +14,13 @@ module Savon
     attr_reader :http
 
     def to_s
-      String.new("HTTP error (#{@http.code})").tap do |str_error|
+      String.new("HTTP error (#{@http.status})").tap do |str_error|
         str_error << ": #{@http.body}" unless @http.body.empty?
       end
     end
 
     def to_hash
-      { :code => @http.code, :headers => @http.headers, :body => @http.body }
+      { :code => @http.status, :headers => @http.headers, :body => @http.body }
     end
 
   end

data/lib/savon/mock/expectation.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "httpi"
+require "faraday"
 
 module Savon
   class MockExpectation
@@ -41,8 +41,8 @@ module Savon
       unless @response
         raise ExpectationError, "This expectation was not set up with a response."
       end
-
-      HTTPI::Response.new(@response[:code], @response[:headers], @response[:body])
+      env = Faraday::Env.from(status: @response[:code], response_headers: @response[:headers], response_body: @response[:body])
+      Faraday::Response.new(env)
     end
 
     private
@@ -75,7 +75,7 @@ module Savon
         next if (expected_value == :any &&  msg_real.include?(key))
         return false if expected_value != msg_real[key]
       end
-      return true
+      true
     end
   end
 end

data/lib/savon/operation.rb

@@ -7,6 +7,8 @@ require "savon/response"
 require "savon/request_logger"
 require "savon/http_error"
 require "mail"
+require 'faraday/gzip'
+
 
 module Savon
   class Operation
@@ -58,16 +60,20 @@ module Savon
       builder = build(locals, &block)
 
       response = Savon.notify_observers(@name, builder, @globals, @locals)
-      response ||= call_with_logging build_request(builder)
+      response ||= call_with_logging build_connection(builder)
 
-      raise_expected_httpi_response! unless response.kind_of?(HTTPI::Response)
+      raise_expected_faraday_response! unless response.kind_of?(Faraday::Response)
 
       create_response(response)
     end
 
     def request(locals = {}, &block)
       builder = build(locals, &block)
-      build_request(builder)
+      connection = build_connection(builder)
+      connection.build_request(:post) do |req|
+        req.url(@globals[:endpoint])
+        req.body = @locals[:body]
+      end
     end
 
     private
@@ -83,37 +89,47 @@ module Savon
       @locals = locals
     end
 
-    def call_with_logging(request)
-      @logger.log(request) { HTTPI.post(request, @globals[:adapter]) }
+    def call_with_logging(connection)
+      ntlm_auth = handle_ntlm(connection) if @globals.include?(:ntlm)
+      @logger.log_response(connection.post(@globals[:endpoint]) { |request|
+        request.body = @locals[:body]
+        request.headers['Authorization'] = "NTLM #{auth.encode64}" if ntlm_auth
+        @logger.log_request(request)
+      })
     end
 
-    def build_request(builder)
-      @locals[:soap_action] ||= soap_action
-      @globals[:endpoint] ||= endpoint
+    def handle_ntlm(connection)
+      ntlm_message = Net::NTLM::Message
+      response = connection.get(@globals[:endpoint]) do |request|
+        request.headers['Authorization'] = 'NTLM ' + ntlm_message::Type1.new.encode64
+      end
+      challenge = response.headers['www-authenticate'][/(?:NTLM|Negotiate) (.*)$/, 1]
+      message = ntlm_message::Type2.decode64(challenge)
+      message.response([:user, :password, :domain].zip(@globals[:ntlm]).to_h)
+    end
 
-      request = SOAPRequest.new(@globals).build(
+    def build_connection(builder)
+      @globals[:endpoint] ||= endpoint
+      @locals[:soap_action] ||= soap_action
+      @locals[:body] = builder.to_s
+      @connection = SOAPRequest.new(@globals).build(
         :soap_action => soap_action,
         :cookies     => @locals[:cookies],
         :headers     => @locals[:headers]
-      )
-
-      request.url = endpoint
-      request.body = builder.to_s
-
-      if builder.multipart
-        request.gzip
-        request.headers["Content-Type"] = ["multipart/related",
-                                           "type=\"#{SOAP_REQUEST_TYPE[@globals[:soap_version]]}\"",
-                                           "start=\"#{builder.multipart[:start]}\"",
-                                           "boundary=\"#{builder.multipart[:multipart_boundary]}\""].join("; ")
-        request.headers["MIME-Version"] = "1.0"
+      ) do |connection|
+        if builder.multipart
+          connection.request :gzip
+          connection.headers["Content-Type"] = %W[multipart/related
+                                                  type="#{SOAP_REQUEST_TYPE[@globals[:soap_version]]}",
+                                                  start="#{builder.multipart[:start]}",
+                                                  boundary="#{builder.multipart[:multipart_boundary]}"].join("; ")
+          connection.headers["MIME-Version"] = "1.0"
+        end
+
+        connection.headers["Content-Length"] = @locals[:body].bytesize.to_s
       end
 
-      # TODO: could HTTPI do this automatically in case the header
-      #       was not specified manually? [dh, 2013-01-04]
-      request.headers["Content-Length"] = request.body.bytesize.to_s
 
-      request
     end
 
     def soap_action
@@ -138,8 +154,8 @@ module Savon
       end
     end
 
-    def raise_expected_httpi_response!
-      raise Error, "Observers need to return an HTTPI::Response to mock " \
+    def raise_expected_faraday_response!
+      raise Error, "Observers need to return a Faraday::Response to mock " \
                    "the request or nil to execute the request."
     end
 

data/lib/savon/options.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "logger"
-require "httpi"
 
 module Savon
   class Options
@@ -10,6 +9,10 @@ module Savon
       assign options
     end
 
+    def deprecate(option)
+      raise DeprecatedOptionError.new(option)
+    end
+
     attr_reader :option_type
 
     def [](option)
@@ -127,7 +130,7 @@ module Savon
       @options[:namespace] = namespace
     end
 
-    # The namespace identifer.
+    # The namespace identifier.
     def namespace_identifier(identifier)
       @options[:namespace_identifier] = identifier
     end
@@ -198,13 +201,11 @@ module Savon
 
     # Whether or not to log.
     def log(log)
-      HTTPI.log = log
       @options[:log] = log
     end
 
     # The logger to use. Defaults to a Savon::Logger instance.
     def logger(logger)
-      HTTPI.logger = logger
       @options[:logger] = logger
     end
 
@@ -257,6 +258,7 @@ module Savon
 
     # Sets the cert key file to use.
     def ssl_cert_key_file(file)
+      deprecate('ssl_cert_key_file')
       @options[:ssl_cert_key_file] = file
     end
 
@@ -267,11 +269,13 @@ module Savon
 
     # Sets the cert key password to use.
     def ssl_cert_key_password(password)
+      deprecate('ssl_cert_key_password')
       @options[:ssl_cert_key_password] = password
     end
 
     # Sets the cert file to use.
     def ssl_cert_file(file)
+      deprecate('ssl_cert_file')
       @options[:ssl_cert_file] = file
     end
 
@@ -287,10 +291,12 @@ module Savon
 
     # Sets the ca cert to use.
     def ssl_ca_cert(cert)
+      deprecate('ssl_ca_cert')
       @options[:ssl_ca_cert] = cert
     end
 
     def ssl_ciphers(ciphers)
+      deprecate('ssl_ciphers')
       @options[:ssl_ciphers] = ciphers
     end
 
@@ -311,6 +317,7 @@ module Savon
 
     # HTTP digest auth credentials.
     def digest_auth(*credentials)
+      deprecate('digest_auth')
       @options[:digest_auth] = credentials.flatten
     end
 
@@ -360,7 +367,7 @@ module Savon
       @options[:multipart] = multipart
     end
 
-    # Instruct Savon what HTTPI adapter it should use instead of default
+    # Instruct Savon what Faraday adapter it should use instead of default
     def adapter(adapter)
       @options[:adapter] = adapter
     end
@@ -389,7 +396,8 @@ module Savon
       defaults = {
         :advanced_typecasting => true,
         :response_parser      => :nokogiri,
-        :multipart            => false
+        :multipart            => false,
+        :body                 => false
       }
 
       super defaults.merge(options)
@@ -397,7 +405,7 @@ module Savon
 
     # The local SOAP header. Expected to be a Hash or respond to #to_s.
     # Will be merged with the global SOAP header if both are Hashes.
-    # Otherwise the local option will be prefered.
+    # Otherwise the local option will be preferred.
     def soap_header(header)
       @options[:soap_header] = header
     end
@@ -457,7 +465,11 @@ module Savon
       @options[:soap_action] = soap_action
     end
 
-    # Cookies to be used for the next request.
+    # Cookies to be used for the next request
+    # @param [Hash] cookies cookies associated to nil will be appended as array cookies, if you need a cookie equal to
+    # and empty string, set it to ""
+    # @example cookies({accept: 'application/json', some-cookie: 'foo', "empty-cookie": "", HttpOnly: nil})
+    # # => "accept=application/json; some-cookie=foo; empty-cookie=; HttpOnly"
     def cookies(cookies)
       @options[:cookies] = cookies
     end
@@ -485,5 +497,9 @@ module Savon
     def headers(headers)
       @options[:headers] = headers
     end
+
+    def body(body)
+      @options[:body] = body
+    end
   end
 end

data/lib/savon/request.rb

@@ -1,61 +1,87 @@
 # frozen_string_literal: true
-require "httpi"
+require "faraday"
 
 module Savon
   class HTTPRequest
 
-    def initialize(globals, http_request = nil)
+    def initialize(globals, connection = nil)
       @globals = globals
-      @http_request = http_request || HTTPI::Request.new
-    end
-
-    def build
-      @http_request
+      @connection = connection || Faraday::Connection.new
     end
 
     private
 
     def configure_proxy
-      @http_request.proxy = @globals[:proxy] if @globals.include? :proxy
+      connection.proxy = @globals[:proxy] if @globals.include? :proxy
     end
 
     def configure_timeouts
-      @http_request.open_timeout = @globals[:open_timeout] if @globals.include? :open_timeout
-      @http_request.read_timeout = @globals[:read_timeout] if @globals.include? :read_timeout
-      @http_request.write_timeout = @globals[:write_timeout] if @globals.include? :write_timeout
+      connection.options.open_timeout = @globals[:open_timeout] if @globals.include? :open_timeout
+      connection.options.read_timeout = @globals[:read_timeout] if @globals.include? :read_timeout
+      connection.options.write_timeout = @globals[:write_timeout] if @globals.include? :write_timeout
     end
 
     def configure_ssl
-      @http_request.auth.ssl.ssl_version   = @globals[:ssl_version]       if @globals.include? :ssl_version
-      @http_request.auth.ssl.min_version   = @globals[:ssl_min_version]   if @globals.include? :ssl_min_version
-      @http_request.auth.ssl.max_version   = @globals[:ssl_max_version]   if @globals.include? :ssl_max_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
+      connection.ssl.verify          = @globals[:ssl_verify]        if @globals.include? :ssl_verify
+      connection.ssl.ca_file         = @globals[:ssl_ca_cert_file]  if @globals.include? :ssl_ca_cert_file
+      connection.ssl.verify_hostname = @globals[:verify_hostname]   if @globals.include? :verify_hostname
+      connection.ssl.ca_path         = @globals[:ssl_ca_cert_path]  if @globals.include? :ssl_ca_cert_path
+      connection.ssl.verify_mode     = @globals[:ssl_verify_mode]   if @globals.include? :ssl_verify_mode
+      connection.ssl.cert_store      = @globals[:ssl_cert_store]    if @globals.include? :ssl_cert_store
+      connection.ssl.client_cert     = @globals[:ssl_cert]          if @globals.include? :ssl_cert
+      connection.ssl.client_key      = @globals[:ssl_cert_key]      if @globals.include? :ssl_cert_key
+      connection.ssl.certificate     = @globals[:ssl_certificate]   if @globals.include? :ssl_certificate
+      connection.ssl.private_key     = @globals[:ssl_private_key]   if @globals.include? :ssl_private_key
+      connection.ssl.verify_depth    = @globals[:verify_depth]      if @globals.include? :verify_depth
+      connection.ssl.version         = @globals[:ssl_version]       if @globals.include? :ssl_version
+      connection.ssl.min_version     = @globals[:ssl_min_version]   if @globals.include? :ssl_min_version
+      connection.ssl.max_version     = @globals[:ssl_max_version]   if @globals.include? :ssl_max_version
+
+      # No Faraday Equivalent out of box, see: https://lostisland.github.io/faraday/#/customization/ssl-options
+      # connection.ssl.cert_file       = @globals[:ssl_cert_file]     if @globals.include? :ssl_cert_file
+      # connection.ssl.cert_key_file   = @globals[:ssl_cert_key_file] if @globals.include? :ssl_cert_key_file
+      # connection.ssl.ca_cert         = @globals[:ssl_ca_cert]       if @globals.include? :ssl_ca_cert
+      # connection.ssl.ciphers         = @globals[:ssl_ciphers]       if @globals.include? :ssl_ciphers
+      # connection.ssl.cert_key_password = @globals[:ssl_cert_key_password] if @globals.include? :ssl_cert_key_password
+
     end
 
     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
+      basic_auth if @globals.include?(:basic_auth)
+      ntlm_auth if @globals.include?(:ntlm)
+    end
+
+    def basic_auth
+      connection.request(:authorization, :basic, *@globals[:basic_auth])
+    end
+
+    def ntlm_auth
+      begin
+        require 'rubyntlm'
+        require 'faraday/net_http_persistent'
+        connection.adapter :net_http_persistent, pool_size: 5
+      rescue LoadError
+        raise LoadError, 'Using NTLM Auth requires both `rubyntlm` and `faraday-net_http_persistent` to be installed.'
+      end
     end
 
     def configure_redirect_handling
-      if @globals.include? :follow_redirects
-        @http_request.follow_redirect = @globals[:follow_redirects]
+      if @globals[:follow_redirects]
+        require 'faraday/follow_redirects'
+        connection.response :follow_redirects
       end
     end
+
+    def configure_adapter
+      connection.adapter(*@globals[:adapter]) unless @globals[:adapter].nil?
+    end
+
+    def configure_logging
+      connection.response(:logger, nil, headers: @globals[:log_headers], level: @globals[:logger].level) if @globals[:log]
+    end
+
+    protected
+    attr_reader :connection
   end
 
   class WSDLRequest < HTTPRequest
@@ -63,18 +89,18 @@ module Savon
     def build
       configure_proxy
       configure_timeouts
-      configure_headers
       configure_ssl
       configure_auth
-      configure_redirect_handling
-
-      @http_request
+      configure_adapter
+      configure_logging
+      configure_headers
+      connection
     end
 
     private
 
     def configure_headers
-      @http_request.headers = @globals[:headers] if @globals.include? :headers
+      connection.headers = @globals[:headers] if @globals.include? :headers
     end
   end
 
@@ -88,26 +114,34 @@ module Savon
     def build(options = {})
       configure_proxy
       configure_timeouts
-      configure_headers options[:soap_action], options[:headers]
-      configure_cookies options[:cookies]
       configure_ssl
       configure_auth
+      configure_headers(options[:soap_action], options[:headers])
+      configure_cookies(options[:cookies])
+      configure_adapter
+      configure_logging
       configure_redirect_handling
-
-      @http_request
+      yield(connection) if block_given?
+      connection
     end
 
     private
 
     def configure_cookies(cookies)
-      @http_request.set_cookies(cookies) if cookies
+      connection.headers['Cookie'] = cookies.map do |key, value|
+        if value.nil?
+          key
+        else
+          "#{key}=#{value}"
+        end
+      end.join('; ') if cookies
     end
 
     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]
+      connection.headers = @globals[:headers] if @globals.include? :headers
+      connection.headers.merge!(headers) if headers
+      connection.headers["SOAPAction"]   ||= %{"#{soap_action}"} if soap_action
+      connection.headers["Content-Type"] ||= CONTENT_TYPE[@globals[:soap_version]] % @globals[:encoding]
     end
   end
 end

data/lib/savon/request_logger.rb

@@ -27,21 +27,24 @@ module Savon
     def log_headers?
       @globals[:log_headers]
     end
-
-    private
-
     def log_request(request)
-      logger.info  { "SOAP request: #{request.url}" }
+      return unless log?
+      logger.info  { "SOAP request: #{request.path}" }
       logger.info  { headers_to_log(request.headers) } if log_headers?
       logger.debug { body_to_log(request.body) }
     end
 
     def log_response(response)
-      logger.info  { "SOAP response (status #{response.code})" }
+      return response unless log?
+      logger.info  { "SOAP response (status #{response.status})" }
       logger.debug { headers_to_log(response.headers) } if log_headers?
       logger.debug { body_to_log(response.body) }
+      response
     end
 
+    private
+
+
     def headers_to_log(headers)
       headers.map { |key, value| "#{key}: #{value}" }.join("\n")
     end

data/lib/savon/soap_fault.rb

@@ -5,7 +5,7 @@ module Savon
     def self.present?(http, xml = nil)
       xml ||= http.body
       fault_node  = xml.include?("Fault>")
-      soap1_fault = xml.match(/faultcode\/?\>/) && xml.match(/faultstring\/?\>/)
+      soap1_fault = xml.match(/faultcode\/?>/) && xml.match(/faultstring\/?>/)
       soap2_fault = xml.include?("Code>") && xml.include?("Reason>")
 
       fault_node && (soap1_fault || soap2_fault)

data/lib/savon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Savon
-  VERSION = '2.15.0'
+  VERSION = '3.0.0.rc1'
 end

data/lib/savon.rb

@@ -7,6 +7,14 @@ module Savon
   UnknownOperationError = Class.new(Error)
   InvalidResponseError  = Class.new(Error)
 
+  class DeprecatedOptionError < Error
+    attr_accessor :option
+    def initialize(option)
+      @option = option
+      super("#{option} is deprecated as it is not supported in Faraday. See https://github.com/savonrb/savon/blob/main/UPGRADING.md for more information.")
+    end
+  end
+
   def self.client(globals = {}, &block)
     Client.new(globals, &block)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -25,45 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: httpi
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.5
-    - - "<"
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: faraday-gzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.5
-    - - "<"
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: wasabi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: akami
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: faraday-net_http_persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rubyntlm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +212,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="