savon 2.15.1 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df435a9b3a37060f3dbbfe5ba2f8b36c33ad66b6474afa08771396b6812fb4b3
-  data.tar.gz: ac8cccabad1588894528b1d2ad073e576224a6b4a5b25d10a0437fb5a807e538
+  metadata.gz: e494bfc08714bcce13c230100c2d5677ac2b40cca1a5afb2312534b41c4c81e9
+  data.tar.gz: fb3b31cb0684a0e7742f247f121a9d3d5749fc932ea089ae26bf4af59fd48e24
 SHA512:
-  metadata.gz: 79a1dd54bd1d171afc117927c9b5419f7c6d2e2a5e2b1cfad0072397e786f5932bb3180b40f7ea9d55a08194c1554afddf3efe558959157cdcc7e8b13243beb9
-  data.tar.gz: 9e9f944a60f6f655da4abfed31020befb23a9823bb3437ccb46e527b1b8e091fac81c776fc3057f88985a80bbae3c8bb9746bf8c1e9c3966ac8992bc0ee7f936
+  metadata.gz: b79c099e954cb9bb176a898f515d12bcaaa557d5d15045155029e6322f3121b5304daf76e07d0927323f3e6481b43aee754d0bfa516eb0890807f12ecc6c6053
+  data.tar.gz: f39e6773c7c20d254857a420f6c54f38b74e1e0e64cf2e51254ca4ab43b482e2bb910860fc1f86ce86c18653e940caae115b5ace3dcad8c83db819370dd77b8c

data/CHANGELOG.md

@@ -1,7 +1,33 @@
 # Savon changelog
 
-## Unreleased
-* Add your PR changelog line here
+## 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.
+
+* Add: `transport: :faraday` global option. Defaults to `:httpi` (#992).
+* Add: `client.faraday` returns a memoized `Faraday::Connection` for configuring middleware, SSL, auth, and timeouts when using the Faraday transport.
+* Add: `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.
+* Change: Observers must return `Savon::Transport::Response` (or `nil`) instead of `HTTPI::Response`. Returning `HTTPI::Response` still works but emits a deprecation warning.
+* 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.
+
+* Fix: 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. A deprecation warning is emitted on each call. Use `#full_hash` going forward.
+* Fix: 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.
+* Fix: 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.
+* Fix: Raise a proper `SOAPFault` instead of a raw exception when `soap:Fault` contains invalid encoding (#923).
+* Fix: `SOAPFault.present?` was ignoring its `xml` argument and always operating on the instance's own body.
+* Change: Added Ruby 3.4 (#1024) and Ruby 4.0 (#1039) to the CI test matrix.
 
 ## 2.15.1 (2024-07-08)
 

data/README.md

@@ -3,11 +3,10 @@
 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)
+[Mailing list](https://groups.google.com/forum/#!forum/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)
 
 
@@ -52,6 +51,27 @@ response.body
 For more examples, you should check out the
 [integration tests](https://github.com/savonrb/savon/tree/version2/spec/integration).
 
+## Faraday transport
+
+Savon uses HTTPI for HTTP by default. To opt into Faraday instead, add `faraday` to your Gemfile and set `transport: :faraday`:
+
+```ruby
+client = Savon.client(
+  transport: :faraday,
+  wsdl: "http://service.example.com?wsdl"
+)
+```
+
+Configure SSL, auth, timeouts, middleware, and anything else transport-related on the `Faraday::Connection` before making calls:
+
+```ruby
+client.faraday.ssl.verify               = false
+client.faraday.options.timeout          = 30
+client.faraday.options.open_timeout     = 5
+client.faraday.headers["Authorization"] = "Bearer #{token}"
+client.faraday.use Faraday::Response::Logger
+```
+
 ## Ruby version support
 
 Every savon release is tested with contemporary supported versions of ruby. Historical compatibility information:

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
@@ -10,5 +12,7 @@ RSpec::Core::RakeTask.new "spec:integration" do |t|
   t.pattern = "spec/integration/**/*_spec.rb"
 end
 
-task :default => :spec
-task :test => :spec
+desc "Alias for spec task"
+task test: :spec
+
+task default: :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 > 0
+      if block.arity.positive?
         block.call(@target)
       else
-        @original = eval("self", block.binding)
+        @original = eval("self", block.binding, __FILE__, __LINE__)
         instance_eval(&block)
       end
     end
@@ -22,6 +22,5 @@ module Savon
     rescue NoMethodError
       @original.send(method, *args, &block)
     end
-
   end
 end

data/lib/savon/builder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "savon/header"
 require "savon/message"
 require "nokogiri"
@@ -12,12 +13,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"
 
@@ -34,7 +35,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
@@ -71,33 +72,36 @@ module Savon
 
     def to_s
       return @locals[:xml] if @locals.include? :xml
+
       build_document
     end
 
     private
 
     def convert_type_definitions_to_hash
-      @wsdl.type_definitions.inject({}) do |memo, (path, type)|
+      @wsdl.type_definitions.each_with_object({}) do |(path, type), memo|
         memo[path] = type
-        memo
       end
     end
 
     def convert_type_namespaces_to_hash
-      @wsdl.type_namespaces.inject({}) do |memo, (path, uri)|
+      @wsdl.type_namespaces.each_with_object({}) do |(path, uri), memo|
         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)
-        identifier = "ins#{@internal_namespace_count}"
+      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}"
         namespaces["xmlns:#{identifier}"] = uri
-        @internal_namespace_count += 1
+        @internal_namespace_count += 1 unless wsdl_identifier
       end
 
       [path, identifier]
@@ -116,21 +120,9 @@ 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
@@ -145,8 +137,9 @@ module Savon
 
     def namespaced_message_tag
       tag_name = message_tag
-      return [tag_name] if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
-      if namespace_identifier == nil
+      return [tag_name] if @wsdl.document? && @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,6 +157,7 @@ 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}>"
@@ -177,7 +171,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
@@ -187,7 +181,7 @@ module Savon
     end
 
     def body_message
-      if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
+      if @wsdl.document? && @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
         serialized_messages
       else
         message.to_s
@@ -221,7 +215,7 @@ module Savon
 
     def builder
       builder = ::Builder::XmlMarkup.new
-      builder.instruct!(:xml, :encoding => @globals[:encoding])
+      builder.instruct!(:xml, encoding: @globals[:encoding])
       builder
     end
 
@@ -254,7 +248,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
@@ -269,10 +263,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,19 +1,26 @@
 # frozen_string_literal: true
+
 require "savon/operation"
-require "savon/request"
+require "savon/transport/httpi"
+require "savon/transport/faraday"
 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.kind_of? Hash
+      unless globals.is_a? Hash
         raise_version1_initialize_error! globals
       end
 
       set_globals(globals, block)
+      @globals.validate_transport!
 
       unless wsdl_or_endpoint_and_namespace_specified?
         raise_initialization_error!
@@ -24,13 +31,25 @@ 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)
+      Operation.create(operation_name, @wsdl, @globals, build_transport)
     end
 
     def call(operation_name, locals = {}, &block)
@@ -48,6 +67,15 @@ 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
@@ -58,12 +86,16 @@ 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.adapter     = @globals[:adapter]     if @globals.include? :adapter
+      @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.request = WSDLRequest.new(@globals).build
+      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
     end
 
     def wsdl_or_endpoint_and_namespace_specified?
@@ -72,9 +104,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!
@@ -88,6 +120,5 @@ module Savon
     def raise_missing_wsdl_error!
       raise "Unable to inspect the service without a WSDL document."
     end
-
   end
 end

data/lib/savon/header.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
+
 require "akami"
 require "gyoku"
 require "securerandom"
 
 module Savon
   class Header
-
     def initialize(globals, locals)
-      @gyoku_options  = { :key_converter => globals[:convert_request_keys_to] }
+      @gyoku_options  = { key_converter: globals[:convert_request_keys_to] }
 
       @wsse_auth      = locals[:wsse_auth].nil? ? globals[:wsse_auth] : locals[:wsse_auth]
       @wsse_timestamp = locals[:wsse_timestamp].nil? ? globals[:wsse_timestamp] : locals[:wsse_timestamp]
@@ -41,7 +41,7 @@ module Savon
 
     def build_header
       header =
-        if global_header.kind_of?(Hash) && local_header.kind_of?(Hash)
+        if global_header.is_a?(Hash) && local_header.is_a?(Hash)
           global_header.merge(local_header)
         elsif local_header
           local_header
@@ -58,16 +58,17 @@ module Savon
     end
 
     def build_wsa_header
-       return '' unless @globals[:use_wsa_headers]
-       convert_to_xml({
-         'wsa:Action' => @locals[:soap_action],
-         'wsa:To' => @globals[:endpoint],
-         'wsa:MessageID' => "urn:uuid:#{SecureRandom.uuid}"
-       })
+      return '' unless @globals[:use_wsa_headers]
+
+      convert_to_xml({
+        'wsa:Action'    => @locals[:soap_action],
+        'wsa:To'        => @globals[:endpoint],
+        'wsa:MessageID' => "urn:uuid:#{SecureRandom.uuid}"
+      })
     end
 
     def convert_to_xml(hash_or_string)
-      if hash_or_string.kind_of? Hash
+      if hash_or_string.is_a? Hash
         Gyoku.xml(hash_or_string, gyoku_options)
       else
         hash_or_string.to_s
@@ -78,12 +79,11 @@ module Savon
       wsse = Akami.wsse
       wsse.credentials(*wsse_auth) if wsse_auth
       wsse.timestamp = wsse_timestamp if wsse_timestamp
-      if wsse_signature && wsse_signature.have_document?
+      if wsse_signature&.have_document?
         wsse.signature = wsse_signature
       end
 
       wsse
     end
-
   end
 end

data/lib/savon/http_error.rb

@@ -2,7 +2,6 @@
 
 module Savon
   class HTTPError < Error
-
     def self.present?(http)
       http.error?
     end
@@ -20,8 +19,7 @@ module Savon
     end
 
     def to_hash
-      { :code => @http.code, :headers => @http.headers, :body => @http.body }
+      { code: @http.code, headers: @http.headers, body: @http.body }
     end
-
   end
 end

data/lib/savon/log_message.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require "nokogiri"
 
 module Savon
   class LogMessage
-
     def initialize(message, filters = [], pretty_print = false)
       @message      = message
       @filters      = filters
@@ -46,8 +46,7 @@ module Savon
     end
 
     def nokogiri_options
-      @pretty_print ? { :indent => 2 } : { :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML }
+      @pretty_print ? { indent: 2 } : { save_with: Nokogiri::XML::Node::SaveOptions::AS_XML }
     end
-
   end
 end

data/lib/savon/message.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require "savon/qualified_message"
 require "gyoku"
 
 module Savon
   class Message
-
     def initialize(message_tag, namespace_identifier, types, used_namespaces, message, element_form_default, key_converter, unwrap)
       @message_tag = message_tag
       @namespace_identifier = namespace_identifier
@@ -18,21 +18,20 @@ module Savon
     end
 
     def to_s
-      return @message.to_s unless @message.kind_of? Hash
+      return @message.to_s unless @message.is_a? Hash
 
       if @element_form_default == :qualified
         @message = QualifiedMessage.new(@types, @used_namespaces, @key_converter).to_hash(@message, [@message_tag.to_s])
       end
 
       gyoku_options = {
-        :element_form_default => @element_form_default,
-        :namespace            => @namespace_identifier,
-        :key_converter        => @key_converter,
-        :unwrap               => @unwrap
+        element_form_default: @element_form_default,
+        namespace: @namespace_identifier,
+        key_converter: @key_converter,
+        unwrap: @unwrap
       }
 
       Gyoku.xml(@message, gyoku_options)
     end
-
   end
 end

data/lib/savon/mock/expectation.rb

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
+
 require "httpi"
+require "savon/transport/response"
 
 module Savon
+  # A single test expectation set up by Savon's mock interface.
+  # One expectation covers one operation call in one test.
+  #
+  # Records the expected operation name and message, captures what was
+  # actually called, and either returns a synthetic response or raises
+  # an error on mismatch.
   class MockExpectation
-
     def initialize(operation_name)
-      @expected = { :operation_name => operation_name }
+      @expected = { operation_name: operation_name }
       @actual = nil
     end
 
@@ -15,15 +22,15 @@ module Savon
     end
 
     def returns(response)
-      response = { :code => 200, :headers => {}, :body => response } if response.kind_of?(String)
+      response = { code: 200, headers: {}, body: response } if response.is_a?(String)
       @response = response
       self
     end
 
-    def actual(operation_name, builder, globals, locals)
+    def actual(operation_name, _builder, _globals, locals)
       @actual = {
-        :operation_name => operation_name,
-        :message        => locals[:message]
+        operation_name: operation_name,
+        message: locals[:message]
       }
     end
 
@@ -37,45 +44,52 @@ module Savon
       verify_message!
     end
 
+    # Builds and returns a Transport::Response from the configured response hash.
+    #
+    # @return [Transport::Response]
+    # @raise  [ExpectationError] if no response was configured for this expectation
     def response!
       unless @response
         raise ExpectationError, "This expectation was not set up with a response."
       end
 
-      HTTPI::Response.new(@response[:code], @response[:headers], @response[:body])
+      Transport::Response.new(@response[:code], @response[:headers], @response[:body])
     end
 
     private
 
     def verify_operation_name!
-      unless @expected[:operation_name] == @actual[:operation_name]
-        raise ExpectationError, "Expected a request to the #{@expected[:operation_name].inspect} operation.\n" \
-                                "Received a request to the #{@actual[:operation_name].inspect} operation instead."
-      end
+      return if @expected[:operation_name] == @actual[:operation_name]
+
+      raise ExpectationError, "Expected a request to the #{@expected[:operation_name].inspect} operation.\n" \
+                              "Received a request to the #{@actual[:operation_name].inspect} operation instead."
     end
 
     def verify_message!
       return if @expected[:message].eql? :any
-      unless equals_except_any(@expected[:message], @actual[:message])
-        expected_message = "  with this message: #{@expected[:message].inspect}" if @expected[:message]
-        expected_message ||= "  with no message."
 
-        actual_message = "  with this message: #{@actual[:message].inspect}" if @actual[:message]
-        actual_message ||= "  with no message."
+      return if equals_except_any(@expected[:message], @actual[:message])
 
-        raise ExpectationError, "Expected a request to the #{@expected[:operation_name].inspect} operation\n#{expected_message}\n" \
-        "Received a request to the #{@actual[:operation_name].inspect} operation\n#{actual_message}"
-      end
+      expected_message = "  with this message: #{@expected[:message].inspect}" if @expected[:message]
+      expected_message ||= "  with no message."
+
+      actual_message = "  with this message: #{@actual[:message].inspect}" if @actual[:message]
+      actual_message ||= "  with no message."
+
+      raise ExpectationError, "Expected a request to the #{@expected[:operation_name].inspect} operation\n#{expected_message}\n" \
+      "Received a request to the #{@actual[:operation_name].inspect} operation\n#{actual_message}"
     end
 
     def equals_except_any(msg_expected, msg_real)
-      return true if msg_expected === msg_real
-      return false if (msg_expected.nil? || msg_real.nil?) # If both are nil has returned true
+      # === allows RSpec matchers (e.g. include(:key)) to be used as expected values
+      return true if msg_expected === msg_real # rubocop:disable Style/CaseEquality
+      return false if msg_expected.nil? || msg_real.nil? # If both are nil has returned true
+
       msg_expected.each do |key, expected_value|
-        next if (expected_value == :any &&  msg_real.include?(key))
+        next if expected_value == :any && msg_real.include?(key)
         return false if expected_value != msg_real[key]
       end
-      return true
+      true
     end
   end
 end