savon 2.17.2 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffcf3a770d4dd548ec193c9f6d8b8723eef3a661273dc50e8bb5a06ba99f0f13
-  data.tar.gz: d03d1de9d1bc5b1af722b56dc71e99acc1a46f951f45d377b9eea2974016f2ed
+  metadata.gz: 3f58a5268715a082369bc199231506447defea5f760fae67cb51507a9011836c
+  data.tar.gz: d349d7d546fb236e45f433047bd575dd6f6ec206254707094f02420ec58dfc07
 SHA512:
-  metadata.gz: 5a5e490cbf30a0e2216439dc9ceb51493c5b5fec107ce3ff4219eb8c5ded1c9e3b612b6bb8b44c4163d12a97c73415f441f33542b35e22bd7b1908f8cb123fa2
-  data.tar.gz: c6d5c85d39f406f75e5e0b005b250e5a97da5d60e42ca44fe827d72f97b2fd967a054684be73e8134c19506e8da6e8dcc7222769fa017d2b7c02cf2336e6dc12
+  metadata.gz: 91d6cd948edbb82b643fa5aaeef265dcfeef5037459478f0815f01bdacbe04cb159165301a9f0ebc75fd897470ff2a0b51de1fa256123843698a14925f5ebf43
+  data.tar.gz: 3a9fe95352e4f85e9e88f7eaffba5fb04df58085380ed7c62e8c0f31c0b110b5127c494125f373e97489c789991b6c1271e68df000606c3e1a3311a17edc951a

data/CHANGELOG.md

@@ -1,91 +1,22 @@
 # Savon changelog
 
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [2.17.2] - 2026-06-10
-
-**Fix CVE-2026-53510 and restore 2.17.0 cookie regressions**
-
-### Fixed
-
-* **Fix CVE-2026-53510** `Savon::Model` generated SOAP operation methods by interpolating operation names into Ruby source passed to `module_eval`. An attacker who can control the operation names of a WSDL, can inject Ruby code that executes in the application process. This affects only the `.all_operations` class method provided by `Savon::Model` to automatically register all operations provided by the WSDL. Configuring `Savon::Model` with trusted operation names via `.operations` is safe. Thanks to @connorshea for securely disclosing this, providing a proof and a great report.
-* **`:cookies` request option works again.** The 2.17.0 transport refactor reimplemented cookie handling on top of `Array#map`, which broke callers passing an object that responds to `#cookies` and lost cookie-name de-duplication via `HTTPI::CookieStore`. The HTTPI transport delegates to `HTTPI::Request#set_cookies` again, restoring both shapes.
-* **`response.http.cookies` works again.** 2.17.0's `Savon::Transport::Response` only exposed `code`, `headers`, and `body`. The HTTPI transport now returns `Array<HTTPI::Cookie>` (matching 2.12.1). The Faraday transport returns `Hash<String, String>` so Faraday callers do not need HTTPI types.
-* **`:attachments` now works with a user-supplied `:xml` envelope** ([#761](https://github.com/savonrb/savon/pull/761)). Multipart support shipped in 2.13.0 but only wrapped envelopes Savon built itself. When a caller passed their own `:xml`, attachments were silently dropped.
-
-### Added
-
-* **Faraday `:cookies` option accepts a `String` or `Hash`.** Strings are used verbatim, Hashes are formatted as `"name=value; name=value"`. Round-trippable with the Faraday response shape.
-* **Three Nori response-parsing options exposed as Savon globals:** `:empty_tag_value` (default `nil`), `:convert_dashes_to_underscores` (default `true`), and `:scrub_xml` (default `true`). Defaults match Nori's own for backwards compatibility.
-
-### Changed
-
-* **Minimum Nori version is now `~> 2.7`** (was `~> 2.4`). Needed for the new parsing options (`:empty_tag_value` arrived in Nori 2.6.0, `:scrub_xml` in 2.7.0). The 2.5–2.7 series also brings fixes callers benefit from automatically: invalid byte sequences parse instead of raising, REXML no longer turns `&lt;` inside CDATA into `<`, `xs:date`/`xs:time`/`xs:dateTime` typecasting was corrected, and Nori stopped monkey-patching `String` and `Object`.
-* **Faraday migration hints are now value-aware and verified.** Each hint prints the caller's actual option value and spells out the full gem/require/setup where needed. Fixed several incorrect examples and added tests to verify every hint.
-
-### Deprecated
-
-* Deprecated the global and local `:multipart` options. They have been no-ops since v2.13.0. Specifically since commit 4e7ae5e. Savon detects multipart responses by checking the `Content-Type` header.
-
-## [2.17.1] - 2026-05-21
-
-### Fixed
-
-* [#1008](https://github.com/savonrb/savon/pull/1008) - The HTTPI and Faraday transports no longer set an explicit `Content-Length` request header. The underlying HTTP library already computes it from the body. Sending it as well produced a duplicate header on adapters that do not deduplicate (e.g. httpclient), which some servers reject.
-* Requests using `attachments` were sent with a plain `text/xml` Content-Type instead of `multipart/related`. The 2.17.0 transport refactor assembled the request headers before the multipart body was built, leaving `Builder#multipart` empty at header time, so servers received a multipart body labelled as plain XML. 2.16.x and earlier are unaffected.
-
-## [2.17.0] - 2026-05-19
-
-**Add opt-in Faraday transport**
-
-Callers who set `transport: :faraday` get a memoized `Faraday::Connection` via `client.faraday` and full control over middleware, SSL, auth, and timeouts. Callers who do not set this option see no behavior change. HTTPI remains the default for 2.x.
-
-### Added
-
-* `transport: :faraday` global option. Defaults to `:httpi` (#992).
-* `client.faraday` returns a memoized `Faraday::Connection` for configuring middleware, SSL, auth, and timeouts when using the Faraday transport.
-* `Savon.client` raises if `transport: :faraday` is set but the faraday gem is not installed, or if any httpi-specific global option (`proxy`, timeouts, `ssl`, auth, `adapter`) is set alongside it. All conflicts are reported with their Faraday equivalents.
-
-### Changed
-
-* Observers must return `Savon::Transport::Response` (or `nil`) instead of `HTTPI::Response`.
-
-### Deprecated
-
-* The HTTPI transport (currently the default) and all HTTPI-specific global options enumerated in `Savon::FaradayMigrationHint::OPTIONS` (`proxy`, `open_timeout`, `read_timeout`, `write_timeout`, the `ssl_*` family, `basic_auth`, `digest_auth`, `ntlm`, `follow_redirects`, `adapter`) will be removed in 3.0. Migrate to `transport: :faraday`. `FaradayMigrationHint` shows the Faraday equivalent for each option.
-* Returning `HTTPI::Response` from observers emits a deprecation warning and will be removed in 3.0. Return `Savon::Transport::Response` instead.
-
-The Faraday transport unblocks:
-
-* redirect following for WSDL fetches via `faraday-follow-redirects` middleware (#1033, savonrb/wasabi#18)
-* digest authentication via `faraday-digestauth` middleware (#1021, savonrb/httpi#250)
-* proxy authentication with special characters in passwords (#941)
-* and setting an `Accept` header for WSDL requests from Rails apps (savonrb/wasabi#115)
-
-## [2.16.0] - 2026-05-18
-
-**Restore compatibility**
-
-If you stayed on 2.12.1 because a later version broke something, this release is for you. The fixes below target the most commonly reported upgrade blockers. Existing code should work without modification.
-
-### Fixed
-
-* Restore `Savon::Response#hash` removed in 2.14.0 (#985). Callers on 2.12.1 that use `response.hash` get the soap body back instead of Ruby's integer object id.
-* Require wasabi >= 5.1.0 (#1015, #1016). Wasabi 4.x used message names as soap body element names and SOAPAction header values instead of operation names (savonrb/wasabi#122), causing servers to return a fault or reject the action for operations whose message name carried an `In` suffix.
-* Stop dumping all WSDL namespaces into every soap envelope (#1014, #942). 2.13.0 injected every namespace from the entire WSDL document into each request, including structural ones that have no place in a request body. Strict servers reject envelopes with unexpected or duplicate declarations.
-* Raise a proper `SOAPFault` instead of a raw exception when `soap:Fault` contains invalid encoding (#923).
-* `SOAPFault.present?` was ignoring its `xml` argument and always operating on the instance's own body.
-
-### Changed
-
-* Added Ruby 3.4 (#1024) and Ruby 4.0 (#1039) to the CI test matrix.
-
-### Deprecated
-
-* `Savon::Response#hash` emits a deprecation warning on each call. Use `#full_hash` going forward. Will be removed in 3.0.
+## 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)
 
@@ -1239,8 +1170,3 @@ Pay attention to the following list and read the updated Wiki: http://wiki.githu
 ## 0.5.0 (2009-11-29)
 
 * Complete rewrite and public release.
-
-[2.17.2]: https://github.com/savonrb/savon/compare/v2.17.1...v2.17.2
-[2.17.1]: https://github.com/savonrb/savon/compare/v2.17.0...v2.17.1
-[2.17.0]: https://github.com/savonrb/savon/compare/v2.16.0...v2.17.0
-[2.16.0]: https://github.com/savonrb/savon/compare/v2.15.1...v2.16.0

data/README.md

@@ -2,88 +2,88 @@
 
 Heavy metal SOAP client
 
+[Documentation](https://www.rubydoc.info/gems/savon/) | [Support](https://stackoverflow.com/questions/tagged/savon) |
+[Mailing list](https://groups.google.com/forum/#!forum/savonrb) | [Twitter](http://twitter.com/savonrb)
+
 [![Ruby](https://github.com/savonrb/savon/actions/workflows/ci.yml/badge.svg)](https://github.com/savonrb/savon/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/savon.svg)](http://badge.fury.io/rb/savon)
+[![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)
 
-Savon is a SOAP client for Ruby. [SOAP is the protocol](https://www.w3.org/TR/soap/) spoken by many enterprise systems. When they hand you a WSDL URL or file instead of a REST spec, it's SOAP. Savon reads the WSDL, maps available operations to Ruby symbols, converts Ruby hashes to SOAP envelopes and turns XML responses into hashes you can work with.
-
-Full documentation is at [savonrb.com](https://savonrb.com).
+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).
 
 ## Installation
 
-```ruby
-gem 'savon', '~> 2.17'
+Savon is available through [Rubygems](http://rubygems.org/gems/savon) and can be installed via:
+
+```
+$ gem install savon
 ```
 
-## Usage
+or add it to your Gemfile like this:
 
-```ruby
+```
+gem 'savon', '~> 3.0.0'
+```
+
+## Usage example
+
+``` ruby
 require 'savon'
 
-# Point Savon to a local or remote WSDL document
-client = Savon.client(wsdl: 'https://service.example.com?wsdl')
+# create a client for the service
+client = Savon.client(wsdl: 'http://service.example.com?wsdl')
+
+# or: create a client with a wsdl provided as a string
+client = Savon.client do |config|
+  wsdl_content = File.read("/path/to/wsdl")
+  config.wsdl wsdl_content
+end
 
-# See what the service exposes
 client.operations
-# => [:find_user, :create_user]
+# => [:find_user, :list_users]
 
-# Make a request and work with the response
+# call the 'findUser' operation
 response = client.call(:find_user, message: { id: 42 })
-response.body[:find_user_response]
-# => { id: 42, name: "Hoff" }
 
-# Savon raises a Savon::SOAPFault when the server returns a SOAP fault
-rescue Savon::SOAPFault => e
-  puts e.to_hash.dig(:fault, :faultstring)
+response.body
+# => { find_user_response: { id: 42, name: 'Hoff' } }
 ```
 
-Enable logging to see the raw SOAP envelopes. That's probably the single most useful thing while getting a new integration working:
+For more examples, you should check out the
+[integration tests](https://github.com/savonrb/savon/tree/version2/spec/integration).
 
-```ruby
-client = Savon.client(
-  wsdl: 'https://service.example.com?wsdl',
-  pretty_print_xml: true,
-  log: true
-)
-```
-
-### Authentication
-
-Most enterprise services require authentication. Common options:
-
-```ruby
-# HTTP basic auth
-Savon.client(wsdl: '...', basic_auth: ['user', 'secret'])
+## Upgrading from v2.x to v3.x
 
-# WS-Security (WSSE)
-Savon.client(wsdl: '...', wsse_auth: ['user', 'secret', :digest], wsse_timestamp: true)
-```
-
-See [Authentication](https://savonrb.com/version2/globals.html) on the website for HTTP digest, NTLM, and certificate-based options.
+See [UPGRADING.md](UPGRADING.md) for more information.
 
-### Transport
+## Ruby version support
 
-Savon uses [HTTPI](https://github.com/savonrb/httpi) for HTTP by default. Since v2.17.0 you can opt-in to use Faraday by passing `transport: :faraday` which exposes the Faraday connection at `client.faraday` for you to configure. Savon is only adding some SOAP-specifics on top.
+Every savon release is tested with contemporary supported versions of ruby. Historical compatibility information:
 
-## Ruby support
+* `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
 
-Savon 2.x requires Ruby >= 3.0.0, kept as the lower bound for backward compatibility. Note that Ruby 3.0–3.3 are EOL or security-only. Ruby 3.4+ is the minimum version with active maintenance.
+If you are running MRI 1.8.7, try a 2.6.x release.
 
-## Versioning & stability
+Most changes are not backported to older versions of savon, or unsupported ruby versions.
 
-Savon follows [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html). The changelog format is [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+## Running tests
 
-**The 2.x line is anchored on 2.12.1.** Every 2.x release is supposed to be safe to upgrade to from 2.12.1, and anything that worked in 2.12.1 keeps working. We do not remove or rename public APIs in the 2.x line. New behavior is opt-in and requires an explicit option change. If you found a problem with that, please let us know.
-
-We only soft-deprecate APIs we plan to remove. The `Deprecated` sections of the [changelog](CHANGELOG.md) list every API that is planned to be removed with version 3.0.
+```bash
+$ bundle install
+$ bundle exec rspec
+```
 
-Callers on 2.13.0–2.15.x may see specific post-2.12.1 behaviors restored to the 2.12.1 contract. This is intentional.
+## FAQ
 
-## Known limitations
+* URI::InvalidURIError -- if you see this error, then it is likely that the http client you are using cannot parse the URI for your WSDL. Try `gem install httpclient` or add it to your `Gemfile`.
+  - See https://github.com/savonrb/savon/issues/488 for more info
 
-**WSDL imports are not followed.** Savon parses only the root WSDL document via [Wasabi](https://github.com/savonrb/wasabi). Messages, port types, and bindings defined in imported files are invisible to Savon. If you control the WSDL, merge the imported elements into the root document and pass that to Savon as a string. If you need full import support, the [WSDL](https://rubygems.org/gems/wsdl) gem is an alternative.
 
-## Contributing
+## Documentation
 
-See [CONTRIBUTING.md](CONTRIBUTING.md). MIT licensed.
+Please be sure to [read the documentation](https://www.rubydoc.info/github/savonrb/savon/).

data/Rakefile

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
@@ -12,7 +10,5 @@ RSpec::Core::RakeTask.new "spec:integration" do |t|
   t.pattern = "spec/integration/**/*_spec.rb"
 end
 
-desc "Alias for spec task"
-task test: :spec
-
-task default: :spec
+task :default => :spec
+task :test => :spec

data/lib/savon/block_interface.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
-
 module Savon
   class BlockInterface
+
     def initialize(target)
       @target = target
     end
 
     def evaluate(block)
-      if block.arity.positive?
+      if block.arity > 0
         block.call(@target)
       else
-        @original = eval("self", block.binding, __FILE__, __LINE__)
+        @original = eval("self", block.binding)
         instance_eval(&block)
       end
     end
@@ -22,5 +22,6 @@ module Savon
     rescue NoMethodError
       @original.send(method, *args, &block)
     end
+
   end
 end

data/lib/savon/builder.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require "savon/header"
 require "savon/message"
 require "nokogiri"
@@ -13,12 +12,12 @@ module Savon
     SCHEMA_TYPES = {
       "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema",
       "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
-    }.freeze
+    }
 
     SOAP_NAMESPACE = {
       1 => "http://schemas.xmlsoap.org/soap/envelope/",
       2 => "http://www.w3.org/2003/05/soap-envelope"
-    }.freeze
+    }
 
     WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing"
 
@@ -35,7 +34,7 @@ module Savon
     end
 
     def pretty
-      Nokogiri.XML(to_s).to_xml(indent: 2)
+      Nokogiri.XML(to_s).to_xml(:indent => 2)
     end
 
     def build_document
@@ -70,45 +69,35 @@ module Savon
       @body_attributes ||= @signature.nil? ? {} : @signature.body_attributes
     end
 
-    # Returns the request body as a String. When the caller supplies a pre-built
-    # envelope via the :xml local option it is used verbatim, but it must still
-    # be wrapped in a multipart message when :attachments are present.
-    # Otherwise the attachments are silently dropped.
     def to_s
-      if @locals.include?(:xml)
-        xml = @locals[:xml]
-        @locals[:attachments] ? build_multipart_message(xml) : xml
-      else
-        build_document
-      end
+      return @locals[:xml] if @locals.include? :xml
+      build_document
     end
 
     private
 
     def convert_type_definitions_to_hash
-      @wsdl.type_definitions.each_with_object({}) do |(path, type), memo|
+      @wsdl.type_definitions.inject({}) do |memo, (path, type)|
         memo[path] = type
+        memo
       end
     end
 
     def convert_type_namespaces_to_hash
-      @wsdl.type_namespaces.each_with_object({}) do |(path, uri), memo|
+      @wsdl.type_namespaces.inject({}) do |memo, (path, uri)|
         key, value = use_namespace(path, uri)
         memo[key] = value
+        memo
       end
     end
 
     def use_namespace(path, uri)
       @internal_namespace_count ||= 0
 
-      unless (identifier = namespace_by_uri(uri))
-        wsdl_identifier = @wsdl.document? ? @wsdl.parser.namespaces.key(uri) : nil
-        # The prefix may already be taken by the target namespace or a user-supplied
-        # :namespaces override - fall back to ins0, ins1... rather than overwriting it.
-        wsdl_identifier = nil if wsdl_identifier && namespaces.key?("xmlns:#{wsdl_identifier}")
-        identifier = wsdl_identifier || "ins#{@internal_namespace_count}"
+      unless identifier = namespace_by_uri(uri)
+        identifier = "ins#{@internal_namespace_count}"
         namespaces["xmlns:#{identifier}"] = uri
-        @internal_namespace_count += 1 unless wsdl_identifier
+        @internal_namespace_count += 1
       end
 
       [path, identifier]
@@ -127,9 +116,21 @@ module Savon
           @globals[:namespace] || @wsdl.namespace
 
         # check env_namespace
-        namespaces["xmlns#{env_namespace && env_namespace != '' ? ":#{env_namespace}" : ''}"] =
+        namespaces["xmlns#{env_namespace && env_namespace != "" ? ":#{env_namespace}" : ''}"] =
           SOAP_NAMESPACE[@globals[:soap_version]]
 
+        if @wsdl&.document
+          @wsdl.parser.namespaces.each do |identifier, path|
+            next if identifier == 'xmlns' # Do not include xmlns namespace as this causes issues for some servers (https://github.com/savonrb/savon/issues/986)
+
+            prefixed_identifier = "xmlns:#{identifier}"
+
+            next if namespaces.key?(prefixed_identifier)
+
+            namespaces[prefixed_identifier] = path
+          end
+        end
+
         namespaces
       end
     end
@@ -144,9 +145,8 @@ module Savon
 
     def namespaced_message_tag
       tag_name = message_tag
-      return [tag_name] if @wsdl.document? && @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
-
-      if namespace_identifier.nil?
+      return [tag_name] if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
+      if namespace_identifier == nil
         [tag_name, message_attributes]
       elsif @used_namespaces[[tag_name.to_s]]
         [@used_namespaces[[tag_name.to_s]], tag_name, message_attributes]
@@ -164,7 +164,6 @@ module Savon
       message_tag = serialized_message_tag[1]
       @wsdl.soap_input(@operation_name.to_sym)[message_tag].each_pair do |message, type|
         break if @locals[:message].nil?
-
         message_locals = @locals[:message][StringUtils.snakecase(message).to_sym]
         message_content = Message.new(message_tag, namespace_identifier, @types, @used_namespaces, message_locals, :unqualified, @globals[:convert_request_keys_to], @globals[:unwrap]).to_s
         messages += "<#{message} xsi:type=\"#{type.join(':')}\">#{message_content}</#{message}>"
@@ -178,7 +177,7 @@ module Savon
       message_tag = wsdl_tag_name.keys.first if wsdl_tag_name.is_a?(Hash)
       message_tag ||= @locals[:message_tag]
       message_tag ||= wsdl_tag_name
-      message_tag ||= Gyoku.xml_tag(@operation_name, key_converter: @globals[:convert_request_keys_to])
+      message_tag ||= Gyoku.xml_tag(@operation_name, :key_converter => @globals[:convert_request_keys_to])
 
       message_tag.to_sym
     end
@@ -188,7 +187,7 @@ module Savon
     end
 
     def body_message
-      if @wsdl.document? && @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
+      if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
         serialized_messages
       else
         message.to_s
@@ -222,7 +221,7 @@ module Savon
 
     def builder
       builder = ::Builder::XmlMarkup.new
-      builder.instruct!(:xml, encoding: @globals[:encoding])
+      builder.instruct!(:xml, :encoding => @globals[:encoding])
       builder
     end
 
@@ -255,7 +254,7 @@ module Savon
 
       # the mail.body.encoded algorithm reorders the parts, default order is [ "text/plain", "text/enriched", "text/html" ]
       # should redefine the sort order, because the soap request xml should be the first
-      multipart_message.body.set_sort_order ["text/xml"]
+      multipart_message.body.set_sort_order [ "text/xml" ]
 
       multipart_message.body.encoded(multipart_message.content_transfer_encoding)
     end
@@ -270,10 +269,10 @@ module Savon
       end
       multipart_message.add_part xml_part
 
-      # request.headers["Content-Type"] = "multipart/related; boundary=\"#{multipart_message.body.boundary}\"; type=\"text/xml\"; start=\"#{xml_part.content_id}\""
+      #request.headers["Content-Type"] = "multipart/related; boundary=\"#{multipart_message.body.boundary}\"; type=\"text/xml\"; start=\"#{xml_part.content_id}\""
       @multipart = {
         multipart_boundary: multipart_message.body.boundary,
-        start: xml_part.content_id
+        start: xml_part.content_id,
       }
 
       multipart_message

data/lib/savon/client.rb

@@ -1,26 +1,19 @@
 # frozen_string_literal: true
-
 require "savon/operation"
-require "savon/transport/httpi"
-require "savon/transport/faraday"
+require "savon/request"
 require "savon/options"
 require "savon/block_interface"
 require "wasabi"
 
 module Savon
-  # The main entry point for Savon.
-  #
-  # Holds global configuration, owns the WSDL document, and dispatches
-  # named operations. A single Client instance is typically shared across
-  # multiple calls to the same service.
   class Client
+
     def initialize(globals = {}, &block)
-      unless globals.is_a? Hash
+      unless globals.kind_of? Hash
         raise_version1_initialize_error! globals
       end
 
       set_globals(globals, block)
-      @globals.validate_transport!
 
       unless wsdl_or_endpoint_and_namespace_specified?
         raise_initialization_error!
@@ -31,25 +24,13 @@ module Savon
 
     attr_reader :globals, :wsdl
 
-    # Returns the memoized Faraday::Connection for this client.
-    # Callers use this to configure middleware, SSL, auth, timeouts, and any
-    # other transport-level concern before making calls.
-    # Raises ArgumentError if transport is not :faraday.
-    def faraday
-      unless @globals[:transport] == :faraday
-        raise ArgumentError, "client.faraday is only available when transport: :faraday is set"
-      end
-
-      @faraday ||= ::Faraday.new
-    end
-
     def operations
       raise_missing_wsdl_error! unless @wsdl.document?
       @wsdl.soap_actions
     end
 
     def operation(operation_name)
-      Operation.create(operation_name, @wsdl, @globals, build_transport)
+      Operation.create(operation_name, @wsdl, @globals)
     end
 
     def call(operation_name, locals = {}, &block)
@@ -67,15 +48,6 @@ module Savon
 
     private
 
-    # Builds the transport for a single operation.
-    def build_transport
-      if @globals[:transport] == :faraday
-        Transport::Faraday.new(faraday, @globals)
-      else
-        Transport::HTTPI.new(@globals)
-      end
-    end
-
     def set_globals(globals, block)
       globals = GlobalOptions.new(globals)
       BlockInterface.new(globals).evaluate(block) if block
@@ -86,16 +58,12 @@ module Savon
     def build_wsdl_document
       @wsdl = Wasabi::Document.new
 
-      @wsdl.document  = @globals[:wsdl]      if @globals.include? :wsdl
-      @wsdl.endpoint  = @globals[:endpoint]  if @globals.include? :endpoint
-      @wsdl.namespace = @globals[:namespace] if @globals.include? :namespace
+      @wsdl.document    = @globals[:wsdl]        if @globals.include? :wsdl
+      @wsdl.endpoint    = @globals[:endpoint]    if @globals.include? :endpoint
+      @wsdl.namespace   = @globals[:namespace]   if @globals.include? :namespace
+      @wsdl.adapter     = @globals[:adapter]     if @globals.include? :adapter
 
-      if @globals[:transport] == :faraday
-        @wsdl.request = faraday
-      else
-        @wsdl.adapter = @globals[:adapter] if @globals.include? :adapter
-        @wsdl.request = Transport::HTTPI.new(@globals).wsdl_request
-      end
+      @wsdl.request = WSDLRequest.new(@globals).build
     end
 
     def wsdl_or_endpoint_and_namespace_specified?
@@ -104,9 +72,9 @@ module Savon
 
     def raise_version1_initialize_error!(object)
       raise InitializationError,
-            "Some code tries to initialize Savon with the #{object.inspect} (#{object.class}) \n" \
-            "Savon 2 expects a Hash of options for creating a new client and executing requests.\n" \
-            "Please read the updated documentation for version 2: http://savonrb.com/version2.html"
+        "Some code tries to initialize Savon with the #{object.inspect} (#{object.class}) \n" \
+        "Savon 2 expects a Hash of options for creating a new client and executing requests.\n" \
+        "Please read the updated documentation for version 2: http://savonrb.com/version2.html"
     end
 
     def raise_initialization_error!
@@ -120,5 +88,6 @@ module Savon
     def raise_missing_wsdl_error!
       raise "Unable to inspect the service without a WSDL document."
     end
+
   end
 end