flexmock 2.4.2 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55630790b40e21c94d842f9b5a173f0a3e2535aa40c4cc23c00aaaedaeaeb31a
-  data.tar.gz: 2afc06542cbe3ef561fb51239ccdfd646e677ee5508038d7532fe427049713f8
+  metadata.gz: 95477346c9b4f5310e7aab502150273b0473194442fdee505ab366efbbba77bf
+  data.tar.gz: cf44602d7ddfa3197ff847e476da46adc9b82a07382c100e2eb149abc56ae285
 SHA512:
-  metadata.gz: e41731de6baa727d4580e5033180becda98c24a9b0522bf41a802f133023e20d6052c2d4a812ee435204cc8159bfdab32d3ddc66922ba8a69b8bf4427e89e13e
-  data.tar.gz: fc31b71f78372d05cc3e44e7648d9a5c8c9f7499ac56a4713e63eb1a3db4ba4f9b2107ae989cf967d44e0206e0f8e134ec675821c3710248952835daa8e1b457
+  metadata.gz: bc7337acd6e30ede212fbe23f44149c9b76693dacec228e06fac7b4f60bb684d9a641b2fd3b5be3b7fe401cc22bc8eeaff01883808fd594c6d7e6209f9128db5
+  data.tar.gz: cc11b26a6a3508adae240889c9c1e1c2484876b965f6dc82f54282061c8405bcf52d8e5b6f15a963239c9cf939cd50f9c2c74ad82bf9d469bec1a25d021c1ae8

data/README.md

@@ -22,6 +22,16 @@ Only significant changes (new APIs, deprecated APIs or backward-compatible
 changes) are documented here, a.k.a. minor or major version bumps. If you want a
 detailed changelog, go over the commit log in github (it's pretty low-traffic)
 
+2.4.0:
+ - forward-compatible implementation of `with_kw_args`, `with_any_kw_args`,
+   `with_block` and `with_no_block`. The objective of this release is to ensure
+   that any test changes needed to handle Ruby 3 (along with flexmock 3) can run
+   on ruby 2.7 and flexmock 2.4
+ - the default behavior of flexmock 2 regarding proc matching, that is that one
+   needs to match them explicitly, is unchanged. Use `with_optional_block` instead
+   of passing `optional_proc` to `with`, to match optionally (IMPORTANT
+   the explicit `with` methods that match blocks are called `block`, not `proc`)
+
 2.3.0:
  - implemented validation of call arity for partial mocks. By setting
      FlexMock.partials_verify_signatures = true

data/lib/flexmock/argument_matchers.rb

@@ -67,6 +67,39 @@ class FlexMock
     end
   end
 
+  ####################################################################
+  # Match hashes that match all the fields of +hash+.
+  class KwArgsMatcher
+    def initialize(expected)
+      @expected = expected
+    end
+    def ===(target)
+      return false unless target.kind_of?(Hash)
+      matching = @expected.all? do |k, v|
+        v === target[k] || v == target[k]
+      end
+      return false unless matching
+
+      @expected.size == target.size
+    end
+    def inspect
+      args = @expected.map do |k, v|
+        k_s = case k
+        when Symbol
+          "#{k}: "
+        else
+          "#{k.inspect} => "
+        end
+
+        v_s = FlexMock.forbid_mocking("<recursive call to mocked method in #inspect>") do
+          v.inspect
+        end
+        "#{k_s}#{v_s}"
+      end
+      args.join(", ")
+    end
+  end
+
   ####################################################################
   # Match objects that implement all the methods in +methods+.
   class DuckMatcher

data/lib/flexmock/composite_expectation.rb

@@ -3,7 +3,8 @@ class FlexMock
   # A composite expectation allows several expectations to be grouped into a
   # single composite and then apply the same constraints to  all expectations
   # in the group.
-  class CompositeExpectation
+  class CompositeExpectation < BasicObject
+    attr_reader :expectations
 
     # Initialize the composite expectation.
     def initialize

data/lib/flexmock/core_class_methods.rb

@@ -97,6 +97,18 @@ class FlexMock
       end
     end
 
+    # Class method to format a list of args (the part between the
+    # parenthesis).
+    def format_kw_args(args)
+      if args
+        FlexMock.forbid_mocking("<recursive call to mocked method in #inspect>") do
+          args.inspect
+        end
+      else
+        "**args"
+      end
+    end
+
     # Check will assert the block returns true.  If it doesn't, an
     # assertion failure is triggered with the given message.
     def check(msg, &block)  # :nodoc:

data/lib/flexmock/expectation.rb

@@ -65,6 +65,7 @@ class FlexMock
     def description
       result = ["should_receive(#{@sym.inspect})"]
       result << ".with(#{FlexMock.format_args(@expected_args)})" if @expected_args
+      result << ".with_kw_args(#{FlexMock.format_kw_args(@expected_kw_args)})" if @expected_kw_args
       @count_validators.each do |validator|
         result << validator.describe
       end
@@ -241,7 +242,12 @@ class FlexMock
     # Declare that the method can be called with any number of
     # arguments of any type.
     def with_kw_args(matcher)
-      @expected_kw_args = matcher
+      @expected_kw_args =
+        if matcher.kind_of?(Hash)
+          KwArgsMatcher.new(matcher)
+        else
+          matcher
+        end
       self
     end
 

data/lib/flexmock/expectation_recorder.rb

@@ -34,7 +34,7 @@ class FlexMock
     def apply(mock)
       obj = mock
       @expectations.each do |sym, args, block|
-        obj = obj.send(sym, *args, &block)
+        obj = obj.__send__(sym, *args, &block)
       end
     end
   end

data/lib/flexmock/partial_mock.rb

@@ -287,6 +287,7 @@ class FlexMock
                 r.apply(mock)
               end
             end
+            # Workaround kw arg support for ruby < 2.7
             super(*args, &block)
           end
         end

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.4.2"
+    VERSION = "2.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.5
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2025-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest