rspec-expectations 3.9.3 → 3.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba515bcbb264eef62d6948840e73b71ef3a68ed947d2e711df04fdf1b04fa4ec
-  data.tar.gz: ba8501df256831e843786ca4f78cc7825e8ad6dca125191beda504de0c1d16e7
+  metadata.gz: 0a7b90c1caeec07d53054eb0536482494c2584e6d7cb0fc9cfd3493ebc6b27a7
+  data.tar.gz: 2eed511b0562ee702eb71bda98058c61d9ddda6c7b0337adde7acd72ddfb81df
 SHA512:
-  metadata.gz: ac2ff1267b689ba5daf08898a11ff97f1f2554db817f43135a6b1d96bcada94f03d728ddda4050158fcf8a483b8295644457aea810d18b37686d5aa253007917
-  data.tar.gz: 6527bed095e09131e0e8a50f12784d017953f073b4099d710df7fff638f632d03bedba40836adeba6aa33f51d9d4c501f795c364c6e1304ddc8c41225df2c18d
+  metadata.gz: 7d0ea4666034e2901450f23fe706d1258f0b2c37ac7edd823477e31eae7c6d56e597a0b728cea0fe5f12ab80ee43ac4ed1a5c203ef34f66d180b40713adedf81
+  data.tar.gz: 3b42d8706be59eb0dd511497941c34cebaff7476394f3f1ca80326d26c362bf3b37cca520ae0c6002a8efe167ee3fe7707e41e53072ac000c8c2a89f960fa6c0

data/Changelog.md

@@ -1,3 +1,11 @@
+### 3.9.4 / 2020-10-29
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.9.3...v3.9.4)
+
+Bug Fixes:
+
+* Fix regression with `be_` and `have_` matchers and arguments implementing `to_hash`
+  were they would act like keywords and be cast to a hash. (Jon Rowe, #1222)
+
 ### 3.9.3 / 2020-10-23
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.9.2...v3.9.3)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.9.3'
+      STRING = '3.9.4'
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -953,31 +953,17 @@ module RSpec
     HAS_REGEX = /^(?:have_)(.*)/
     DYNAMIC_MATCHER_REGEX = Regexp.union(BE_PREDICATE_REGEX, HAS_REGEX)
 
-    if RSpec::Support::RubyFeatures.kw_args_supported?
-      binding.eval(<<-CODE, __FILE__, __LINE__)
-      def method_missing(method, *args, **kwargs, &block)
-        case method.to_s
-        when BE_PREDICATE_REGEX
-          BuiltIn::BePredicate.new(method, *args, **kwargs, &block)
-        when HAS_REGEX
-          BuiltIn::Has.new(method, *args, **kwargs, &block)
-        else
-          super
-        end
-      end
-      CODE
-    else
-      def method_missing(method, *args, &block)
-        case method.to_s
-        when BE_PREDICATE_REGEX
-          BuiltIn::BePredicate.new(method, *args, &block)
-        when HAS_REGEX
-          BuiltIn::Has.new(method, *args, &block)
-        else
-          super
-        end
+    def method_missing(method, *args, &block)
+      case method.to_s
+      when BE_PREDICATE_REGEX
+        BuiltIn::BePredicate.new(method, *args, &block)
+      when HAS_REGEX
+        BuiltIn::Has.new(method, *args, &block)
+      else
+        super
       end
     end
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 
     if RUBY_VERSION.to_f >= 1.9
       def respond_to_missing?(method, *)

data/lib/rspec/matchers/built_in/be.rb

@@ -193,22 +193,12 @@ module RSpec
       class BePredicate < BaseMatcher
         include BeHelpers
 
-        if RSpec::Support::RubyFeatures.kw_args_supported?
-          binding.eval(<<-CODE, __FILE__, __LINE__)
-          def initialize(*args, **kwargs, &block)
-            @expected = parse_expected(args.shift)
-            @args = args
-            @kwargs = kwargs
-            @block = block
-          end
-          CODE
-        else
-          def initialize(*args, &block)
-            @expected = parse_expected(args.shift)
-            @args = args
-            @block = block
-          end
+        def initialize(*args, &block)
+          @expected = parse_expected(args.shift)
+          @args = args
+          @block = block
         end
+        ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
 
         def matches?(actual, &block)
           @actual  = actual
@@ -259,22 +249,9 @@ module RSpec
           end
         end
 
-        if RSpec::Support::RubyFeatures.kw_args_supported?
-          binding.eval(<<-CODE, __FILE__, __LINE__)
-          def predicate_matches?
-            method_name = actual.respond_to?(predicate) ? predicate : present_tense_predicate
-            if @kwargs.empty?
-              @predicate_matches = actual.__send__(method_name, *@args, &@block)
-            else
-              @predicate_matches = actual.__send__(method_name, *@args, **@kwargs, &@block)
-            end
-          end
-          CODE
-        else
-          def predicate_matches?
-            method_name = actual.respond_to?(predicate) ? predicate : present_tense_predicate
-            @predicate_matches = actual.__send__(method_name, *@args, &@block)
-          end
+        def predicate_matches?
+          method_name = actual.respond_to?(predicate) ? predicate : present_tense_predicate
+          @predicate_matches = actual.__send__(method_name, *@args, &@block)
         end
 
         def predicate

data/lib/rspec/matchers/built_in/has.rb

@@ -5,17 +5,10 @@ module RSpec
       # Provides the implementation for `has_<predicate>`.
       # Not intended to be instantiated directly.
       class Has < BaseMatcher
-        if RSpec::Support::RubyFeatures.kw_args_supported?
-          binding.eval(<<-CODE, __FILE__, __LINE__)
-          def initialize(method_name, *args, **kwargs, &block)
-            @method_name, @args, @kwargs, @block = method_name, args, kwargs, block
-          end
-          CODE
-        else
-          def initialize(method_name, *args, &block)
-            @method_name, @args, @block = method_name, args, block
-          end
+        def initialize(method_name, *args, &block)
+          @method_name, @args, @block = method_name, args, block
         end
+        ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
 
         # @private
         def matches?(actual, &block)
@@ -72,20 +65,8 @@ module RSpec
           @actual.respond_to? predicate
         end
 
-        if RSpec::Support::RubyFeatures.kw_args_supported?
-          binding.eval(<<-CODE, __FILE__, __LINE__)
-          def predicate_matches?
-            if @kwargs.empty?
-              @actual.__send__(predicate, *@args, &@block)
-            else
-              @actual.__send__(predicate, *@args, **@kwargs, &@block)
-            end
-          end
-          CODE
-        else
-          def predicate_matches?
-            @actual.__send__(predicate, *@args, &@block)
-          end
+        def predicate_matches?
+          @actual.__send__(predicate, *@args, &@block)
         end
 
         def predicate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.9.4
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -202,7 +202,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-expectations/issues
-  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.9.3/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.9.4/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-expectations
@@ -225,5 +225,5 @@ requirements: []
 rubygems_version: 3.1.3
 signing_key:
 specification_version: 4
-summary: rspec-expectations-3.9.3
+summary: rspec-expectations-3.9.4
 test_files: []