flexmock 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d0a8810418e4e6400b70c2704122d81e4a386f631f9013157429963b386fffa
-  data.tar.gz: ee80bbf1bcd0d626efa8d7a5512cfc7343c120d7123e83c16e10a35aad4f73c6
+  metadata.gz: 55630790b40e21c94d842f9b5a173f0a3e2535aa40c4cc23c00aaaedaeaeb31a
+  data.tar.gz: 2afc06542cbe3ef561fb51239ccdfd646e677ee5508038d7532fe427049713f8
 SHA512:
-  metadata.gz: d18374afda345a829ff9264901224891d8fcff4127415e9de3430209f8228cd43285ed79e70dae68b78f35c8affbace80d49767b68a490f67a655cd011bc8518
-  data.tar.gz: 2b49462130ee807ad062f382b1de1a9e3d25138efd41e2436ffbbaa9190581579f4c503e2eeadd86ec51e38887c7098558996814fc12d0f56f435d54e6266d8a
+  metadata.gz: e41731de6baa727d4580e5033180becda98c24a9b0522bf41a802f133023e20d6052c2d4a812ee435204cc8159bfdab32d3ddc66922ba8a69b8bf4427e89e13e
+  data.tar.gz: fc31b71f78372d05cc3e44e7648d9a5c8c9f7499ac56a4713e63eb1a3db4ba4f9b2107ae989cf967d44e0206e0f8e134ec675821c3710248952835daa8e1b457

data/flexmock.gemspec

@@ -10,7 +10,7 @@ spec = Gem::Specification.new do |s|
     interface is simple, it is very flexible.
   }
 
-  s.required_ruby_version = ">= 2.5"
+  s.required_ruby_version = ">= 2.2"
 
   s.license = 'MIT'
 

data/lib/flexmock/core.rb

@@ -207,7 +207,7 @@ class FlexMock
 
   # Invocke the original non-mocked functionality for the given
   # symbol.
-  def flexmock_invoke_original(method_name, args)
+  def flexmock_invoke_original(method_name, args, orig_block)
     return FlexMock.undefined
   end
 

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)
@@ -405,16 +405,22 @@ class FlexMock
 
     def pass_thru(&block)
       block ||= lambda { |value| value }
-      and_return { |*args|
+      and_return { |*args, &orig_block|
         begin
-          block.call(@mock.flexmock_invoke_original(@sym, args))
+          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
             raise e, "#{e.message} while performing #pass_thru in expectation object #{self}"
           else
             raise
           end
-        end 
+        end
       }
     end
 

data/lib/flexmock/partial_mock.rb

@@ -162,10 +162,7 @@ class FlexMock
     #
     # Usually called in a #and_return statement
     def invoke_original(m, *args, &block)
-      if block
-        args << block
-      end
-      flexmock_invoke_original(m, args)
+      flexmock_invoke_original(m, args, block)
     end
 
     # Whether the given method's original definition has been stored
@@ -321,7 +318,7 @@ class FlexMock
     # (3) Apply any recorded expecations
     #
     def create_new_mocked_object(allocate_method, args, recorder, block)
-      new_obj = flexmock_invoke_original(allocate_method, args)
+      new_obj = flexmock_invoke_original(allocate_method, args, nil)
       mock = flexmock_container.flexmock(new_obj)
       block.call(mock) unless block.nil?
       recorder.apply(mock)
@@ -331,12 +328,8 @@ class FlexMock
 
     # Invoke the original definition of method on the object supported by
     # the stub.
-    def flexmock_invoke_original(method, args)
+    def flexmock_invoke_original(method, args, block)
       if (original_method = find_original_method(method))
-        if Proc === args.last
-          block = args.last
-          args = args[0..-2]
-        end
         original_method.call(*args, &block)
       else
         @obj.__send__(:method_missing, method, *args, &block)

data/lib/flexmock/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="