rspec-support 3.13.4 → 3.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dda956ef658b6fbdb2fc49fb6d6102cf3bc4325a95d52a40bb5bf470097dd26
-  data.tar.gz: de254d0c76e3cf0994f4a0287dfc833d69de45201edb95d4907376589e22d916
+  metadata.gz: 627c7e28fcb4a040f33ce0f321252d4c659389a6f1230df267c9f923be43c3d9
+  data.tar.gz: 6147b06d1eb09093a6c94ebb4b2779a24f40bf6d137e3800827671f2eac077ff
 SHA512:
-  metadata.gz: 48b8dfb6ee3ca756e5bb3cfd39839cd5bfcefa6a9394eeb64b6aa7258cfe97556f74bdf98c141e023b3c17926ab4a7db85daca8db07ad68541d974654264ec34
-  data.tar.gz: e5ff093696533a98b04225f31e4eb3cc03cdd3d74d63110e531e5bda48d1f8a42ede69c8352f040f1ccf3e27ea077c497b9544610c5e0db7bae90fffdd2bbc22
+  metadata.gz: 9c7110b65063601e4f8fc2cc6f49a43dcd363b5c2bcc94671b515362be6b780e3ab0e7e3c27ed3bd63333574bac38ff697e5d43cf771763c1712a90a4c099c93
+  data.tar.gz: 30b20b1b6134613b68a467f5af2c8edf2570e7f8fe7a6feeb74e751d4f7f577dc7e02243f43fab83c8dfeb0cd7a7809767a4d18394daf1979d4dd11814acffd5

data/Changelog.md

@@ -1,5 +1,14 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec/compare/rspec-support-v3.13.2...3-13-maintenance)
+[Full Changelog](https://github.com/rspec/rspec/compare/rspec-support-v3.13.5...3-13-maintenance)
+
+### 3.13.5
+[Full Changelog](http://github.com/rspec/rspec/compare/rspec-support-v3.13.4...rspec-support-v3.13.5)
+
+Bug Fixes:
+
+* Fix regression in `RSpec::Support::MethodSignature` where positional argument arity confused
+  a check for keyword arguments, meaning a hash would be wrongly detected as keyword arguments
+  when it should have been a positional argument. (Malcolm O'Hare, rspec/rspec#121)
 
 ### 3.13.4
 [Full Changelog](http://github.com/rspec/rspec/compare/rspec-support-v3.13.3...rspec-support-v3.13.4)

data/lib/rspec/support/method_signature_verifier.rb

@@ -79,12 +79,37 @@ module RSpec
           given_kw_args - @allowed_kw_args
         end
 
-        # If the last argument is Hash, Ruby will treat only symbol keys as keyword arguments
-        # the rest will be grouped in another Hash and passed as positional argument.
-        def has_kw_args_in?(args)
-          Hash === args.last &&
-            could_contain_kw_args?(args) &&
-            (RubyFeatures.kw_arg_separation? || args.last.empty? || args.last.keys.any? { |x| x.is_a?(Symbol) })
+        # Considering the arg types, are there kw_args?
+        if RubyFeatures.kw_arg_separation?
+          def has_kw_args_in?(args)
+            # If the last arg is a hash, depending on the signature it could be kw_args or a positional parameter.
+            return false unless Hash === args.last && could_contain_kw_args?(args)
+
+            # If the position of the hash is beyond the count of required and optional positional
+            # args then it is the kwargs hash
+            return true if args.count > @max_non_kw_args
+
+            # This is the proper way to disambiguate between positional args and keywords hash
+            # but relies on beginning of the call chain annotating the method with
+            # ruby2_keywords, so only use it for positive feedback as without the annotation
+            # this is always false
+            return true if Hash.ruby2_keywords_hash?(args[-1])
+
+            # Otherwise, the hash could be defined kw_args or an optional positional parameter
+            # inspect the keys against known kwargs to determine what it is
+            # Note: the problem with this is that if a user passes only invalid keyword args,
+            #       rspec no longer detects is and will assign this to a positional argument
+            return arbitrary_kw_args? || args.last.keys.all? { |x| @allowed_kw_args.include?(x) }
+          end
+        else
+          def has_kw_args_in?(args)
+            # Version <= Ruby 2.7
+            # If the last argument is Hash, Ruby will treat only symbol keys as keyword arguments
+            # the rest will be grouped in another Hash and passed as positional argument.
+            Hash === args.last &&
+              could_contain_kw_args?(args) &&
+              (args.last.empty? || args.last.keys.any? { |x| x.is_a?(Symbol) })
+          end
         end
 
         # Without considering what the last arg is, could it
@@ -282,7 +307,7 @@ module RSpec
 
       def initialize(signature, args=[])
         @signature = signature
-        @non_kw_args, @kw_args = split_args(*args)
+        @non_kw_args, @kw_args = split_args(args.clone)
         @min_non_kw_args = @max_non_kw_args = @non_kw_args
         @arbitrary_kw_args = @unlimited_args = false
       end
@@ -362,7 +387,7 @@ module RSpec
         !@unlimited_args || @signature.unlimited_args?
       end
 
-      def split_args(*args)
+      def split_args(args)
         kw_args = if @signature.has_kw_args_in?(args) && !RubyFeatures.kw_arg_separation?
                     last = args.pop
                     non_kw_args = last.reject { |k, _| k.is_a?(Symbol) }
@@ -395,13 +420,13 @@ module RSpec
     class LooseSignatureVerifier < MethodSignatureVerifier
     private
 
-      def split_args(*args)
+      def split_args(args)
         if RSpec::Support.is_a_matcher?(args.last) && @signature.could_contain_kw_args?(args)
           args.pop
           @signature = SignatureWithKeywordArgumentsMatcher.new(@signature)
         end
 
-        super(*args)
+        super(args)
       end
 
       # If a matcher is used in a signature in place of keyword arguments, all

data/lib/rspec/support/version.rb

@@ -3,7 +3,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.13.4'
+      STRING = '3.13.5'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.13.4
+  version: 3.13.5
 platform: ruby
 authors:
 - David Chelimsky
@@ -123,11 +123,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec/issues
-  changelog_uri: https://github.com/rspec/rspec/blob/rspec-support-v3.13.4/rspec-support/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec/blob/rspec-support-v3.13.5/rspec-support/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/rspec/rspec/blob/rspec-support-v3.13.4/rspec-support
+  source_code_uri: https://github.com/rspec/rspec/blob/rspec-support-v3.13.5/rspec-support
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -145,5 +145,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.7
 specification_version: 4
-summary: rspec-support-3.13.4
+summary: rspec-support-3.13.5
 test_files: []