rspec-mocks 3.12.5 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac306bd185750c3017ee678b47a8049e734c0442b6cef60e8e7a04aa13c29c4
-  data.tar.gz: bde012659ef5fb279c0dee84a6788ba3a58156bfca1d3bdf934c99e6b96c26dc
+  metadata.gz: 4544a3c8c297ac01db63f9b354adc42f23cb91b635bb8a3c786190e305067036
+  data.tar.gz: 7e854083561be7cab34ab290abca139f94636785b5eaa5d01a797c32276e8397
 SHA512:
-  metadata.gz: ccde683caf2726c2f7e9f27d982550a779fdaead2c595495107dab5cdab04609568aedb882fcf47456528a4630dd55ed8c4097fc169ff71e34cc28e724306879
-  data.tar.gz: dec3ab40874ab16f87a20f0332f15afe7a487dd024bcd111843e1edcbfff91366954012d56e2c90e8b7b0518f721cc4f1e9771afad0e0a265034d63c3c6d9b24
+  metadata.gz: dde5e6722136c724658ddc5df5875e6cc39039ea92c42d0758aa85ad7ee644a727afa94c89bee728be523c2dda7505ff648f960c6712d5077e8c88d721377d2d
+  data.tar.gz: d1495943f3c1d06bff956b321bf4359dcbcf04b9541d6ed11ca2f5bdc92fd455b40142f071258f17f3016ba5cc7700a7af03ee4115041c6386396280354a23b6

data/Changelog.md

@@ -1,5 +1,35 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.5...3-12-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.13.1...3-13-maintennace)
+
+### 3.13.1 / 2024-05-08
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.13.0...v3.13.1)
+
+Bug Fixes:
+
+* Use `RSpec::Support::Mutex` in `RSpec::Mocks::Proxy` to avoid issues from
+  stubbing `::Mutex#new`. (Eric Mueller, #1575)
+
+### 3.13.0 / 2024-02-04
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.7...v3.13.0)
+
+Enhancements:
+
+* Add an `array_excluding` matcher for arguments. (Zane Wolfgang Pickett, #1528)
+
+### 3.12.7 / 2024-02-04
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.6...v3.12.7)
+
+Bug Fixes:
+
+* Reduce allocations from "any_instance" style mocks. (Carlos Palhares, #1479)
+
+### 3.12.6 / 2023-07-11
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.5...v3.12.6)
+
+Bug Fixes:
+
+* Fix an issue with `and_call_original` when using the `method_missing` fallback
+  with keyword arguments. (Igor Drozdov, #1552)
 
 ### 3.12.5 / 2023-03-30
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.4...v3.12.5)

data/README.md

@@ -278,6 +278,8 @@ expect(double).to receive(:msg).with(1, duck_type(:abs, :div), "b") #2nd argumen
 expect(double).to receive(:msg).with(hash_including(:a => 5)) # first arg is a hash with a: 5 as one of the key-values
 expect(double).to receive(:msg).with(array_including(5)) # first arg is an array with 5 as one of the key-values
 expect(double).to receive(:msg).with(hash_excluding(:a => 5)) # first arg is a hash without a: 5 as one of the key-values
+expect(double).to receive(:msg).with(start_with('a')) # any matcher, custom or from rspec-expectations
+expect(double).to receive(:msg).with(satisfy { |data| data.dig(:a, :b, :c) == 5 }) # assert anything you want
 ```
 
 ## Receive Counts

data/lib/rspec/mocks/any_instance/recorder.rb

@@ -156,21 +156,23 @@ module RSpec
 
       private
 
-        def ancestor_is_an_observer?(method_name)
-          lambda do |ancestor|
-            unless ancestor == @klass
-              ::RSpec::Mocks.space.
-                any_instance_recorder_for(ancestor).already_observing?(method_name)
-            end
-          end
+        def ancestor_is_an_observer?(ancestor, method_name)
+          return if ancestor == @klass
+
+          ::RSpec::Mocks.space.
+            any_instance_recorder_for(ancestor).already_observing?(method_name)
         end
 
         def super_class_observers_for(method_name)
-          @klass.ancestors.select(&ancestor_is_an_observer?(method_name))
+          @klass.ancestors.select do |ancestor|
+            ancestor_is_an_observer?(ancestor, method_name)
+          end
         end
 
         def super_class_observing?(method_name)
-          @klass.ancestors.any?(&ancestor_is_an_observer?(method_name))
+          @klass.ancestors.any? do |ancestor|
+            ancestor_is_an_observer?(ancestor, method_name)
+          end
         end
 
         def normalize_chain(*args)

data/lib/rspec/mocks/argument_matchers.rb

@@ -71,6 +71,16 @@ module RSpec
         HashIncludingMatcher.new(ArgumentMatchers.anythingize_lonely_keys(*args))
       end
 
+      # Matches a hash that doesn't include the specified key(s) or key/value.
+      #
+      # @example
+      #   expect(object).to receive(:message).with(hash_excluding(:key => val))
+      #   expect(object).to receive(:message).with(hash_excluding(:key))
+      #   expect(object).to receive(:message).with(hash_excluding(:key, :key2 => :val2))
+      def hash_excluding(*args)
+        HashExcludingMatcher.new(ArgumentMatchers.anythingize_lonely_keys(*args))
+      end
+
       # Matches an array that includes the specified items at least once.
       # Ignores duplicates and additional values
       #
@@ -82,14 +92,14 @@ module RSpec
         ArrayIncludingMatcher.new(actually_an_array)
       end
 
-      # Matches a hash that doesn't include the specified key(s) or key/value.
+      # Matches an array that excludes the specified items.
       #
       # @example
-      #   expect(object).to receive(:message).with(hash_excluding(:key => val))
-      #   expect(object).to receive(:message).with(hash_excluding(:key))
-      #   expect(object).to receive(:message).with(hash_excluding(:key, :key2 => :val2))
-      def hash_excluding(*args)
-        HashExcludingMatcher.new(ArgumentMatchers.anythingize_lonely_keys(*args))
+      #   expect(object).to receive(:message).with(array_excluding(1,2,3))
+      #   expect(object).to receive(:message).with(array_excluding([1,2,3]))
+      def array_excluding(*args)
+        actually_an_array = Array === args.first && args.count == 1 ? args.first : args
+        ArrayExcludingMatcher.new(actually_an_array)
       end
 
       alias_method :hash_not_including, :hash_excluding
@@ -236,6 +246,8 @@ module RSpec
 
         def ===(actual)
           actual = actual.uniq
+          return true if (actual & @expected).count >= @expected.count
+
           @expected.uniq.all? do |expected_element|
             actual.any? do |actual_element|
               RSpec::Support::FuzzyMatcher.values_match?(expected_element, actual_element)
@@ -258,6 +270,38 @@ module RSpec
         end
       end
 
+      # @private
+      class ArrayExcludingMatcher
+        def initialize(unexpected)
+          @unexpected = unexpected.uniq
+        end
+
+        def ===(actual)
+          actual = actual.uniq
+          return false unless (actual & @unexpected).empty?
+
+          actual.none? do |actual_element|
+            @unexpected.any? do |unexpected_element|
+              RSpec::Support::FuzzyMatcher.values_match?(unexpected_element, actual_element)
+            end
+          end
+        rescue NoMethodError
+          false
+        end
+
+        def description
+          "array_excluding(#{formatted_unexpected_values})"
+        end
+
+      private
+
+        def formatted_unexpected_values
+          @unexpected.map do |x|
+            RSpec::Support.rspec_description_for_object(x)
+          end.join(", ")
+        end
+      end
+
       # @private
       class DuckTypeMatcher
         def initialize(*methods_to_respond_to)
@@ -312,7 +356,7 @@ module RSpec
         begin
           object.class.name.include?(matcher_namespace)
         rescue NoMethodError
-          # Some objects, like BasicObject, don't implemented standard
+          # Some objects, like BasicObject, don't implement standard
           # reflection methods.
           false
         end

data/lib/rspec/mocks/configuration.rb

@@ -156,7 +156,7 @@ module RSpec
       end
 
       # @private
-      # Used to track wether we are temporarily suppressing verifying partial
+      # Used to track whether we are temporarily suppressing verifying partial
       # doubles with `without_partial_double_verification { ... }`
       attr_accessor :temporarily_suppress_partial_double_verification
 

data/lib/rspec/mocks/message_expectation.rb

@@ -101,7 +101,7 @@ module RSpec
       #
       #   allow(api).to receive(:get_foo).and_invoke(-> { raise ApiTimeout }, -> { raise ApiTimeout }, -> { :a_foo })
       #   api.get_foo # => raises ApiTimeout
-      #   api.get_foo # => rasies ApiTimeout
+      #   api.get_foo # => raises ApiTimeout
       #   api.get_foo # => :a_foo
       #   api.get_foo # => :a_foo
       #   api.get_foo # => :a_foo

data/lib/rspec/mocks/method_double.rb

@@ -26,10 +26,7 @@ module RSpec
         # handler of the object. This accounts for cases where the user has not
         # correctly defined `respond_to?`, and also 1.8 which does not provide
         # method handles for missing methods even if `respond_to?` is correct.
-        @original_implementation_callable ||= original_method ||
-          Proc.new do |*args, &block|
-            @object.__send__(:method_missing, @method_name, *args, &block)
-          end
+        @original_implementation_callable ||= original_method || method_missing_block
       end
 
       alias_method :save_original_implementation_callable!, :original_implementation_callable
@@ -40,6 +37,16 @@ module RSpec
           @proxy.original_method_handle_for(method_name)
       end
 
+      # @private
+      def method_missing_block
+        block = Proc.new do |*args, &b|
+          @object.__send__(:method_missing, @method_name, *args, &b)
+        end
+        block.ruby2_keywords if block.respond_to?(:ruby2_keywords)
+
+        block
+      end
+
       # @private
       def visibility
         @proxy.visibility_for(@method_name)

data/lib/rspec/mocks/proxy.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'mutex'
+
 module RSpec
   module Mocks
     # @private
@@ -9,11 +11,6 @@ module RSpec
         end
       end
 
-      unless defined?(Mutex)
-        Support.require_rspec_support 'mutex'
-        Mutex = Support::Mutex
-      end
-
       # @private
       def ensure_implemented(*_args)
         # noop for basic proxies, see VerifyingProxy for behaviour.
@@ -27,7 +24,7 @@ module RSpec
         @order_group = order_group
         @error_generator = ErrorGenerator.new(object)
         @messages_received = []
-        @messages_received_mutex = Mutex.new
+        @messages_received_mutex = Support::Mutex.new
         @options = options
         @null_object = false
         @method_doubles = Hash.new { |h, k| h[k] = MethodDouble.new(@object, k, self) }

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.12.5'
+      STRING = '3.13.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.12.5
+  version: 3.13.1
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +113,22 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +200,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-mocks/issues
-  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.12.5/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.13.1/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-mocks
@@ -214,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: rspec-mocks-3.12.5
+summary: rspec-mocks-3.13.1
 test_files: []