webmock 2.0.3 → 2.1.0

data/lib/webmock/http_lib_adapters/em_http_request_adapter.rb

@@ -103,7 +103,7 @@ if defined?(EventMachine::HttpClient)
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
         if stubbed_webmock_response
-          WebMock::CallbackRegistry.invoke_callbacks({:lib => :em_http_request}, request_signature, stubbed_webmock_response)
+          WebMock::CallbackRegistry.invoke_callbacks({lib: :em_http_request}, request_signature, stubbed_webmock_response)
           @uri ||= nil
           EM.next_tick {
             setup(make_raw_response(stubbed_webmock_response), @uri,
@@ -121,7 +121,7 @@ if defined?(EventMachine::HttpClient)
         if !stubbed_webmock_response && WebMock::CallbackRegistry.any_callbacks?
           webmock_response = build_webmock_response
           WebMock::CallbackRegistry.invoke_callbacks(
-            {:lib => :em_http_request, :real_request => true},
+            {lib: :em_http_request, real_request: true},
             request_signature,
             webmock_response)
         end
@@ -187,8 +187,8 @@ if defined?(EventMachine::HttpClient)
         WebMock::RequestSignature.new(
           method.downcase.to_sym,
           uri.to_s,
-          :body => body || (@req.file && File.read(@req.file)),
-          :headers => headers
+          body: body || (@req.file && File.read(@req.file)),
+          headers: headers
         )
       end
 

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -54,14 +54,14 @@ if defined?(Excon)
           WebMock::RequestRegistry.instance.requested_signatures.put(mock_request)
 
           if mock_response = WebMock::StubRegistry.instance.response_for_request(mock_request)
-            self.perform_callbacks(mock_request, mock_response, :real_request => false)
+            self.perform_callbacks(mock_request, mock_response, real_request: false)
             response = self.real_response(mock_response)
             response
           elsif WebMock.net_connect_allowed?(mock_request.uri)
             conn = new_excon_connection(params)
-            real_response = conn.request(request_params_from(params.merge(:mock => false)))
+            real_response = conn.request(request_params_from(params.merge(mock: false)))
 
-            ExconAdapter.perform_callbacks(mock_request, ExconAdapter.mock_response(real_response), :real_request => true)
+            ExconAdapter.perform_callbacks(mock_request, ExconAdapter.mock_response(real_response), real_request: true)
 
             real_response.data
           else
@@ -73,7 +73,7 @@ if defined?(Excon)
           # Ensure the connection is constructed with the exact same args
           # that the orginal connection was constructed with.
           args = params.fetch(:__construction_args)
-          ::Excon::Connection.new(connection_params_from args.merge(:mock => false))
+          ::Excon::Connection.new(connection_params_from args.merge(mock: false))
         end
 
         def self.connection_params_from(hash)
@@ -112,7 +112,7 @@ if defined?(Excon)
           method  = (params.delete(:method) || :get).to_s.downcase.to_sym
           params[:query] = to_query(params[:query]) if params[:query].is_a?(Hash)
           uri = Addressable::URI.new(params).to_s
-          WebMock::RequestSignature.new method, uri, :body => body_from(params), :headers => params[:headers]
+          WebMock::RequestSignature.new method, uri, body: body_from(params), headers: params[:headers]
         end
 
         def self.body_from(params)
@@ -128,9 +128,9 @@ if defined?(Excon)
           raise Excon::Errors::Timeout if mock.should_timeout
           mock.raise_error_if_any
           {
-            :body    => mock.body,
-            :status  => mock.status[0].to_i,
-            :headers => mock.headers || {}
+            body: mock.body,
+            status: mock.status[0].to_i,
+            headers: mock.headers || {}
           }
         end
 
@@ -144,7 +144,7 @@ if defined?(Excon)
 
         def self.perform_callbacks(request, response, options = {})
           return unless WebMock::CallbackRegistry.any_callbacks?
-          WebMock::CallbackRegistry.invoke_callbacks(options.merge(:lib => :excon), request, response)
+          WebMock::CallbackRegistry.invoke_callbacks(options.merge(lib: :excon), request, response)
         end
       end
     end

data/lib/webmock/http_lib_adapters/http_rb/request.rb

@@ -2,8 +2,8 @@ module HTTP
   class Request
     def webmock_signature
       ::WebMock::RequestSignature.new(verb, uri.to_s, {
-        :headers  => headers.to_h,
-        :body     => body
+        headers: headers.to_h,
+        body: body
       })
     end
   end

data/lib/webmock/http_lib_adapters/http_rb/response.rb

@@ -20,11 +20,11 @@ module HTTP
         return new(status, "1.1", headers, body, uri) if HTTP::VERSION < "1.0.0"
 
         new({
-          :status   => status,
-          :version  => "1.1",
-          :headers  => headers,
-          :body     => body,
-          :uri      => uri
+          status: status,
+          version: "1.1",
+          headers: headers,
+          body: body,
+          uri: uri
         })
       end
 

data/lib/webmock/http_lib_adapters/http_rb/webmock.rb

@@ -37,7 +37,7 @@ module HTTP
       raise_timeout_error if webmock_response.should_timeout
       webmock_response.raise_error_if_any
 
-      invoke_callbacks(webmock_response, :real_request => false)
+      invoke_callbacks(webmock_response, real_request: false)
       ::HTTP::Response.from_webmock webmock_response, request_signature
     end
 
@@ -49,7 +49,7 @@ module HTTP
     def perform
       return unless ::WebMock.net_connect_allowed?(request_signature.uri)
       response = @perform.call
-      invoke_callbacks(response.to_webmock, :real_request => true)
+      invoke_callbacks(response.to_webmock, real_request: true)
       response
     end
 
@@ -59,7 +59,7 @@ module HTTP
 
     def invoke_callbacks(webmock_response, options = {})
       ::WebMock::CallbackRegistry.invoke_callbacks(
-        options.merge({ :lib => :http_rb }),
+        options.merge({ lib: :http_rb }),
         request_signature,
         webmock_response
       )

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -64,7 +64,7 @@ if defined?(::HTTPClient)
         end
         res = conn.push(response)
         WebMock::CallbackRegistry.invoke_callbacks(
-          {:lib => :httpclient}, request_signature, webmock_response)
+          {lib: :httpclient}, request_signature, webmock_response)
         res
       elsif WebMock.net_connect_allowed?(request_signature.uri)
         # in case there is a nil entry in the hash...
@@ -86,7 +86,7 @@ if defined?(::HTTPClient)
         if WebMock::CallbackRegistry.any_callbacks?
           webmock_response = build_webmock_response(res, body)
           WebMock::CallbackRegistry.invoke_callbacks(
-            {:lib => :httpclient, :real_request => true}, request_signature,
+            {lib: :httpclient, real_request: true}, request_signature,
             webmock_response)
         end
         res
@@ -168,7 +168,7 @@ if defined?(::HTTPClient)
 
   def build_request_signature(req, reuse_existing = false)
     uri = WebMock::Util::URI.heuristic_parse(req.header.request_uri.to_s)
-    uri.query = WebMock::Util::QueryMapper.values_to_query(req.header.request_query, :notation => WebMock::Config.instance.query_values_notation) if req.header.request_query
+    uri.query = WebMock::Util::QueryMapper.values_to_query(req.header.request_query, notation: WebMock::Config.instance.query_values_notation) if req.header.request_query
     uri.port = req.header.request_uri.port
 
     @request_filter.each do |filter|
@@ -185,8 +185,8 @@ if defined?(::HTTPClient)
     signature = WebMock::RequestSignature.new(
       req.header.request_method.downcase.to_sym,
       uri.to_s,
-      :body => req.http_body.dump,
-      :headers => headers
+      body: req.http_body.dump,
+      headers: headers
     )
 
     # reuse a previous identical signature object if we stored one for later use

data/lib/webmock/http_lib_adapters/manticore_adapter.rb

@@ -34,7 +34,7 @@ if defined?(Manticore)
           def format_options(options)
             return options unless headers = options[:headers]
 
-            options.merge(:headers => join_array_values(headers))
+            options.merge(headers: join_array_values(headers))
           end
 
           def join_array_values(headers)
@@ -62,7 +62,7 @@ if defined?(Manticore)
               raise WebMock::NetConnectNotAllowedError.new(request_signature)
             end
 
-            WebMock::CallbackRegistry.invoke_callbacks({:lib => :manticore, :real_request => real_request}, request_signature, webmock_response)
+            WebMock::CallbackRegistry.invoke_callbacks({lib: :manticore, real_request: real_request}, request_signature, webmock_response)
             manticore_response
           end
 
@@ -84,7 +84,7 @@ if defined?(Manticore)
               headers['Authorization'] = WebMock::Util::Headers.basic_auth_header(credentials.get_user_name,credentials.get_password)
             end
 
-            WebMock::RequestSignature.new(method, uri, {:body => body, :headers => headers})
+            WebMock::RequestSignature.new(method, uri, {body: body, headers: headers})
           end
 
           def read_body(request)
@@ -106,10 +106,10 @@ if defined?(Manticore)
             raise Manticore::ConnectTimeout if webmock_response.should_timeout
 
             Manticore::StubbedResponse.stub(
-              :code => webmock_response.status[0],
-              :body => webmock_response.body,
-              :headers => webmock_response.headers,
-              :cookies => {}
+              code: webmock_response.status[0],
+              body: webmock_response.body,
+              headers: webmock_response.headers,
+              cookies: {}
             )
           end
 

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -79,7 +79,7 @@ module WebMock
           if webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
             @socket = Net::HTTP.socket_type.new
             WebMock::CallbackRegistry.invoke_callbacks(
-              {:lib => :net_http}, request_signature, webmock_response)
+              {lib: :net_http}, request_signature, webmock_response)
             build_net_http_response(webmock_response, &block)
           elsif WebMock.net_connect_allowed?(request_signature.uri)
             check_right_http_connection
@@ -87,7 +87,7 @@ module WebMock
               if WebMock::CallbackRegistry.any_callbacks?
                 webmock_response = build_webmock_response(response)
                 WebMock::CallbackRegistry.invoke_callbacks(
-                  {:lib => :net_http, :real_request => true}, request_signature, webmock_response)
+                  {lib: :net_http, real_request: true}, request_signature, webmock_response)
               end
               response.extend Net::WebMockHTTPResponse
               block.call response if block
@@ -292,7 +292,7 @@ module WebMock
         request.set_body_internal body
       end
 
-      WebMock::RequestSignature.new(method, uri, :body => request.body, :headers => headers)
+      WebMock::RequestSignature.new(method, uri, body: request.body, headers: headers)
     end
 
     def self.validate_headers(headers)

data/lib/webmock/http_lib_adapters/patron_adapter.rb

@@ -25,7 +25,7 @@ if defined?(::Patron)
               res = WebMock::HttpLibAdapters::PatronAdapter.
                 build_patron_response(webmock_response, default_response_charset)
               WebMock::CallbackRegistry.invoke_callbacks(
-                {:lib => :patron}, request_signature, webmock_response)
+                {lib: :patron}, request_signature, webmock_response)
               res
             elsif WebMock.net_connect_allowed?(request_signature.uri)
               res = super
@@ -33,7 +33,7 @@ if defined?(::Patron)
                 webmock_response = WebMock::HttpLibAdapters::PatronAdapter.
                   build_webmock_response(res)
                 WebMock::CallbackRegistry.invoke_callbacks(
-                  {:lib => :patron, :real_request => true}, request_signature,
+                  {lib: :patron, real_request: true}, request_signature,
                     webmock_response)
               end
               res
@@ -91,8 +91,8 @@ if defined?(::Patron)
           request_signature = WebMock::RequestSignature.new(
             req.action,
             uri.to_s,
-            :body => request_body,
-            :headers => headers
+            body: request_body,
+            headers: headers
           )
           request_signature
         end

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -69,8 +69,8 @@ if defined?(Typhoeus)
           request_signature = WebMock::RequestSignature.new(
             req.options[:method] || :get,
             uri.to_s,
-            :body => body,
-            :headers => headers
+            body: body,
+            headers: headers
           )
 
           req.instance_variable_set(:@__webmock_request_signature, request_signature)
@@ -90,19 +90,19 @@ if defined?(Typhoeus)
         def self.generate_typhoeus_response(request_signature, webmock_response)
           response = if webmock_response.should_timeout
             ::Typhoeus::Response.new(
-              :code         => 0,
-              :status_message => "",
-              :body         => "",
-              :headers => {},
-              :return_code => :operation_timedout
+              code: 0,
+              status_message: "",
+              body: "",
+              headers: {},
+              return_code: :operation_timedout
             )
           else
             ::Typhoeus::Response.new(
-              :code         => webmock_response.status[0],
-              :status_message => webmock_response.status[1],
-              :body         => webmock_response.body,
-              :headers => webmock_response.headers,
-              :effective_url => request_signature.uri
+              code: webmock_response.status[0],
+              status_message: webmock_response.status[1],
+              body: webmock_response.body,
+              headers: webmock_response.headers,
+              effective_url: request_signature.uri
             )
           end
           response.mock = :webmock
@@ -126,13 +126,13 @@ if defined?(Typhoeus)
               build_webmock_response(response)
           if response.mock
             WebMock::CallbackRegistry.invoke_callbacks(
-              {:lib => :typhoeus},
+              {lib: :typhoeus},
               request_signature,
               webmock_response
             )
           else
             WebMock::CallbackRegistry.invoke_callbacks(
-              {:lib => :typhoeus, :real_request => true},
+              {lib: :typhoeus, real_request: true},
               request_signature,
               webmock_response
             )

data/lib/webmock/matchers/hash_including_matcher.rb

@@ -4,7 +4,7 @@ module WebMock
     #https://github.com/rspec/rspec-mocks/blob/master/lib/rspec/mocks/argument_matchers.rb
     class HashIncludingMatcher
       def initialize(expected)
-        @expected = Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(expected, :deep => true).sort]
+        @expected = Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(expected, deep: true).sort]
       end
 
       def ==(actual)

data/lib/webmock/rack_response.rb

@@ -10,9 +10,9 @@ module WebMock
       status, headers, response = @app.call(env)
 
       Response.new(
-        :body => body_from_rack_response(response),
-        :headers => headers,
-        :status => status
+        body: body_from_rack_response(response),
+        headers: headers,
+        status: status
       )
     end
 

data/lib/webmock/request_pattern.rb

@@ -49,7 +49,7 @@ module WebMock
 
 
     def assign_options(options)
-      options = WebMock::Util::HashKeysStringifier.stringify_keys!(options, :deep => true)
+      options = WebMock::Util::HashKeysStringifier.stringify_keys!(options, deep: true)
       HashValidator.new(options).validate_keys('body', 'headers', 'query', 'basic_auth')
       set_basic_auth_as_headers!(options)
       @body_pattern = BodyPattern.new(options['body']) if options.has_key?('body')
@@ -120,7 +120,7 @@ module WebMock
       elsif rSpecHashIncludingMatcher?(query_params)
         WebMock::Matchers::HashIncludingMatcher.from_rspec_matcher(query_params)
       else
-        WebMock::Util::QueryMapper.query_to_values(query_params, :notation => Config.instance.query_values_notation)
+        WebMock::Util::QueryMapper.query_to_values(query_params, notation: Config.instance.query_values_notation)
       end
     end
 
@@ -134,7 +134,7 @@ module WebMock
   class URIRegexpPattern  < URIPattern
     def matches?(uri)
       WebMock::Util::URI.variations_of_uri_as_strings(uri).any? { |u| u.match(@pattern) } &&
-        (@query_params.nil? || @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query, :notation => Config.instance.query_values_notation))
+        (@query_params.nil? || @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query, notation: Config.instance.query_values_notation))
     end
 
     def to_s
@@ -173,7 +173,7 @@ module WebMock
       if @pattern.is_a?(Addressable::URI)
         if @query_params
           uri.omit(:query) === @pattern &&
-          (@query_params.nil? || @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query, :notation => Config.instance.query_values_notation))
+          (@query_params.nil? || @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query, notation: Config.instance.query_values_notation))
         else
           uri === @pattern
         end
@@ -185,8 +185,8 @@ module WebMock
     def add_query_params(query_params)
       super
       if @query_params.is_a?(Hash) || @query_params.is_a?(String)
-        query_hash = (WebMock::Util::QueryMapper.query_to_values(@pattern.query, :notation => Config.instance.query_values_notation) || {}).merge(@query_params)
-        @pattern.query = WebMock::Util::QueryMapper.values_to_query(query_hash, :notation => WebMock::Config.instance.query_values_notation)
+        query_hash = (WebMock::Util::QueryMapper.query_to_values(@pattern.query, notation: Config.instance.query_values_notation) || {}).merge(@query_params)
+        @pattern.query = WebMock::Util::QueryMapper.values_to_query(query_hash, notation: WebMock::Config.instance.query_values_notation)
         @query_params = nil
       end
     end
@@ -254,7 +254,7 @@ module WebMock
       when :xml then
         Crack::XML.parse(body)
       else
-        WebMock::Util::QueryMapper.query_to_values(body, :notation => Config.instance.query_values_notation)
+        WebMock::Util::QueryMapper.query_to_values(body, notation: Config.instance.query_values_notation)
       end
     end
 
@@ -307,7 +307,7 @@ module WebMock
     end
 
     def normalize_hash(hash)
-      Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(hash, :deep => true).sort]
+      Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(hash, deep: true).sort]
     end
 
   end

data/lib/webmock/request_stub.rb

@@ -30,14 +30,14 @@ module WebMock
 
     def to_raise(*exceptions)
       @responses_sequences << ResponsesSequence.new([*exceptions].flatten.map {|e|
-        ResponseFactory.response_for(:exception => e)
+        ResponseFactory.response_for(exception: e)
       })
       self
     end
     alias_method :and_raise, :to_raise
 
     def to_timeout
-      @responses_sequences << ResponsesSequence.new([ResponseFactory.response_for(:should_timeout => true)])
+      @responses_sequences << ResponsesSequence.new([ResponseFactory.response_for(should_timeout: true)])
       self
     end
     alias_method :and_timeout, :to_timeout
@@ -84,15 +84,15 @@ module WebMock
 
       if signature.body.to_s != ''
         body = if signature.url_encoded?
-          WebMock::Util::QueryMapper.query_to_values(signature.body, :notation => Config.instance.query_values_notation)
+          WebMock::Util::QueryMapper.query_to_values(signature.body, notation: Config.instance.query_values_notation)
         else
           signature.body
         end
-        stub.with(:body => body)
+        stub.with(body: body)
       end
 
       if (signature.headers && !signature.headers.empty?)
-        stub.with(:headers => signature.headers)
+        stub.with(headers: signature.headers)
       end
       stub
     end