webmock 1.8.1 → 1.8.2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.8.2
+
+* Prevent Webmock `hash_including` from overriding RSpec version 1 `hash_including` method.
+
+    Thanks to [Joe Karayusuf](https://github.com/karayusuf)
+
+* Ensured WebMock handles RSpec 1 `hash_including` matcher for matching query params and body.
+
 ## 1.8.1
 
 * Ensured WebMock doesn't interfere with `em-synchrony`, when `em-synchrony/em-http` is not included.

data/README.md

@@ -697,6 +697,9 @@ People who submitted patches and new features or suggested improvements. Many th
 * Dimitrij Denissenko
 * Marnen Laibow-Koser
 * Evgeniy Dolzhenko
+* Nick Recobra
+* Jordan Elver
+* Joe Karayusuf
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/api.rb

@@ -35,6 +35,8 @@ module WebMock
     def hash_including(expected)
       if defined?(::RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
         RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
+      elsif defined?(::Spec::Mocks::ArgumentMatchers::HashIncludingMatcher)
+        Spec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
       else
         WebMock::Matchers::HashIncludingMatcher.new(expected)
       end

data/lib/webmock/request_pattern.rb

@@ -40,19 +40,19 @@ module WebMock
     private
 
 
-      def assign_options(options)
-        @body_pattern = BodyPattern.new(options[:body]) if options.has_key?(:body)
-        @headers_pattern = HeadersPattern.new(options[:headers]) if options.has_key?(:headers)
-        @uri_pattern.add_query_params(options[:query]) if options.has_key?(:query)
-      end
+    def assign_options(options)
+      @body_pattern = BodyPattern.new(options[:body]) if options.has_key?(:body)
+      @headers_pattern = HeadersPattern.new(options[:headers]) if options.has_key?(:headers)
+      @uri_pattern.add_query_params(options[:query]) if options.has_key?(:query)
+    end
 
-      def create_uri_pattern(uri)
-        if uri.is_a?(Regexp)
-          URIRegexpPattern.new(uri)
-        else
-          URIStringPattern.new(uri)
-        end
+    def create_uri_pattern(uri)
+      if uri.is_a?(Regexp)
+        URIRegexpPattern.new(uri)
+      else
+        URIStringPattern.new(uri)
       end
+    end
 
   end
 
@@ -82,7 +82,8 @@ module WebMock
         query_params
       elsif query_params.is_a?(WebMock::Matchers::HashIncludingMatcher)
         query_params
-      elsif defined?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher) && query_params.is_a?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
+      elsif (defined?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher) && query_params.is_a?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)) ||
+          (defined?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher) && query_params.is_a?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher))
         WebMock::Matchers::HashIncludingMatcher.from_rspec_matcher(query_params)
       else
         Addressable::URI.parse('?' + query_params).query_values
@@ -161,7 +162,8 @@ module WebMock
     def initialize(pattern)
       @pattern = if pattern.is_a?(Hash)
         normalize_hash(pattern)
-      elsif defined?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher) && pattern.is_a?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
+      elsif (defined?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher) && pattern.is_a?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)) ||
+          (defined?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher) && pattern.is_a?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher))
         WebMock::Matchers::HashIncludingMatcher.from_rspec_matcher(pattern)
       else
         pattern
@@ -186,62 +188,62 @@ module WebMock
     end
 
     private
-      def body_as_hash(body, content_type)
-        case BODY_FORMATS[content_type]
-        when :json then
-          WebMock::Util::JSON.parse(body)
-        when :xml then
-          Crack::XML.parse(body)
-        else
-          Addressable::URI.parse('?' + body).query_values
-        end
+    def body_as_hash(body, content_type)
+      case BODY_FORMATS[content_type]
+      when :json then
+        WebMock::Util::JSON.parse(body)
+      when :xml then
+        Crack::XML.parse(body)
+      else
+        Addressable::URI.parse('?' + body).query_values
       end
+    end
 
-      # Compare two hashes for equality
-      #
-      # For two hashes to match they must have the same length and all
-      # values must match when compared using `#===`.
-      #
-      # The following hashes are examples of matches:
-      #
-      #     {a: /\d+/} and {a: '123'}
-      #
-      #     {a: '123'} and {a: '123'}
-      #
-      #     {a: {b: /\d+/}} and {a: {b: '123'}}
-      #
-      #     {a: {b: 'wow'}} and {a: {b: 'wow'}}
-      #
-      # @param [Hash] query_parameters typically the result of parsing
-      #   JSON, XML or URL encoded parameters.
-      #
-      # @param [Hash] pattern which contains keys with a string, hash or
-      #   regular expression value to use for comparison.
-      #
-      # @return [Boolean] true if the paramaters match the comparison
-      #   hash, false if not.
-      def matching_hashes?(query_parameters, pattern)
-        return false unless query_parameters.is_a?(Hash)
-        return false unless query_parameters.keys.sort == pattern.keys.sort
-        query_parameters.each do |key, actual|
-          expected = pattern[key]
-
-          if actual.is_a?(Hash) && expected.is_a?(Hash)
-            return false unless matching_hashes?(actual, expected)
-          else
-            return false unless expected === actual
-          end
+    # Compare two hashes for equality
+    #
+    # For two hashes to match they must have the same length and all
+    # values must match when compared using `#===`.
+    #
+    # The following hashes are examples of matches:
+    #
+    #     {a: /\d+/} and {a: '123'}
+    #
+    #     {a: '123'} and {a: '123'}
+    #
+    #     {a: {b: /\d+/}} and {a: {b: '123'}}
+    #
+    #     {a: {b: 'wow'}} and {a: {b: 'wow'}}
+    #
+    # @param [Hash] query_parameters typically the result of parsing
+    #   JSON, XML or URL encoded parameters.
+    #
+    # @param [Hash] pattern which contains keys with a string, hash or
+    #   regular expression value to use for comparison.
+    #
+    # @return [Boolean] true if the paramaters match the comparison
+    #   hash, false if not.
+    def matching_hashes?(query_parameters, pattern)
+      return false unless query_parameters.is_a?(Hash)
+      return false unless query_parameters.keys.sort == pattern.keys.sort
+      query_parameters.each do |key, actual|
+        expected = pattern[key]
+
+        if actual.is_a?(Hash) && expected.is_a?(Hash)
+          return false unless matching_hashes?(actual, expected)
+        else
+          return false unless expected === actual
         end
-        true
       end
+      true
+    end
 
-      def empty_string?(string)
-        string.nil? || string == ""
-      end
+    def empty_string?(string)
+      string.nil? || string == ""
+    end
 
-      def normalize_hash(hash)
-        Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(hash).sort]
-      end
+    def normalize_hash(hash)
+      Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(hash).sort]
+    end
 
   end
 
@@ -268,9 +270,9 @@ module WebMock
 
     private
 
-      def empty_headers?(headers)
-        headers.nil? || headers == {}
-      end
+    def empty_headers?(headers)
+      headers.nil? || headers == {}
+    end
   end
 
 end

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.8.1' unless defined?(::WebMock::VERSION)
+  VERSION = '1.8.2' unless defined?(::WebMock::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 8
-  - 1
-  version: 1.8.1
+  - 2
+  version: 1.8.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 Z
+date: 2012-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable