flexmock 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fdfec71cb9dd687df62403b26eb8d4d24e4b28ec7f35f5e2d5f3ac6ffed943
-  data.tar.gz: 8f250a12f731099db17e9fcea78b92e0b92ac523376a34e06b5295f3a17ec996
+  metadata.gz: a0f97dabc8c9afa58ef46d4ac17b2e3fa8295f6d20446dc1638291042e41e5d8
+  data.tar.gz: 2bd6a9f043efac740a59f4864da6d668809a30d71ffd97c72efc0c246aaca43f
 SHA512:
-  metadata.gz: 7672fd90360b33327119a7f135a7db9d05c7b7d41e0dd5299396296e0b68c8bb5175eaa2cf8d334b9b8cc62f52a87af4fe8af8216a4e9283341c909eed5ca196
-  data.tar.gz: a2112c506ef7152ba13aef9f67cb9ab5d58a0b566b5f50e7db00e545ff04e663da129f8291109dc25f028b2150ca4a936d96ced1444cbb85b4298534179046dc
+  metadata.gz: 6f06e6198573d73ee08d793ff8f90147a873403a8427e677afdc7301fc06701975f711ebceb51ac5f32c280a29d1c1411a6265095e8bcfa1c362eedd8194a054
+  data.tar.gz: 19325f609dc6e084ce7d0748e0142368d9ca9caf1706733d23287d5001c0f36c9dd25d7194b0a3e5389601628b63aa987a351eb7e6568eb38662a9245cbc8b65

data/.github/workflows/test.yml

@@ -12,7 +12,6 @@ jobs:
           - "3.2"
           - "3.1"
           - "3.0"
-          - "2.7"
 
     steps:
     - uses: actions/checkout@v2

data/lib/flexmock/core.rb

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

data/lib/flexmock/expectation.rb

@@ -392,9 +392,9 @@ class FlexMock
 
     def pass_thru(&block)
       block ||= lambda { |value| value }
-      and_return { |*args, **kw|
+      and_return { |*args, **kw, &orig_block|
         begin
-          block.call(@mock.flexmock_invoke_original(@sym, args, kw))
+          block.call(@mock.flexmock_invoke_original(@sym, args, kw, orig_block))
         rescue NoMethodError => e
           if e.name == @sym
             raise e, "#{e.message} while performing #pass_thru in expectation object #{self}"

data/lib/flexmock/partial_mock.rb

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

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 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-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest