flexmock 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed75deb751a06729f5fd1b31ce17b9568fc959cb74b49d6f1291c0de1a53cb7
-  data.tar.gz: c7c34401a7d5166ce476b36ca94ceba4789b4c77437f71c2e8f1d00afe3803df
+  metadata.gz: 55630790b40e21c94d842f9b5a173f0a3e2535aa40c4cc23c00aaaedaeaeb31a
+  data.tar.gz: 2afc06542cbe3ef561fb51239ccdfd646e677ee5508038d7532fe427049713f8
 SHA512:
-  metadata.gz: c638316ab0058cea04174eaecc228352bc7710935d57d230362908ed86854fcb53e9aa0236d1003a0d0ebaeeecaa34a7735db20a15e40862242f7aecbcde88b2
-  data.tar.gz: c9cd6ea00208e8a7cb0e9d3855886fd2776e8f0d7b60a2fb4a3521ab1051db3d37ea435c44b538215618498197276e83158e05a7b6ea36e29df66c9cac265a5c
+  metadata.gz: e41731de6baa727d4580e5033180becda98c24a9b0522bf41a802f133023e20d6052c2d4a812ee435204cc8159bfdab32d3ddc66922ba8a69b8bf4427e89e13e
+  data.tar.gz: fc31b71f78372d05cc3e44e7648d9a5c8c9f7499ac56a4713e63eb1a3db4ba4f9b2107ae989cf967d44e0206e0f8e134ec675821c3710248952835daa8e1b457

data/lib/flexmock/expectation.rb

@@ -128,7 +128,7 @@ class FlexMock
 
       if @expected_block
         ret_block.call(*args, &block)
-      elsif block
+      elsif block && @expected_block.nil?
         ret_block.call(*args, block)
       else
         ret_block.call(*args)
@@ -407,6 +407,12 @@ class FlexMock
       block ||= lambda { |value| value }
       and_return { |*args, &orig_block|
         begin
+          if @expected_block.nil? && !orig_block
+            if Proc === args.last
+              orig_block = args.last
+              args = args[0..-2]
+            end
+          end
           block.call(@mock.flexmock_invoke_original(@sym, args, orig_block))
         rescue NoMethodError => e
           if e.name == @sym
@@ -414,7 +420,7 @@ class FlexMock
           else
             raise
           end
-        end 
+        end
       }
     end
 

data/lib/flexmock/version.rb

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

metadata

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