flexmock 2.3.8 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55dadc89381c542f0d6f81c9484b4febc6adf1ef2b8292a504d60406e4c6f915
-  data.tar.gz: 80eb120f913a93d90f855442ab0bf8fc13bbec222279dec77340979a8cc8f024
+  metadata.gz: bed75deb751a06729f5fd1b31ce17b9568fc959cb74b49d6f1291c0de1a53cb7
+  data.tar.gz: c7c34401a7d5166ce476b36ca94ceba4789b4c77437f71c2e8f1d00afe3803df
 SHA512:
-  metadata.gz: 8afcf774571ed28b0e90b631ebfb88e91812c9494f2bef4c3b1d36dc4726514c7fb21ff22f6c9accd5331f214a5f5f12826b5d1d07a6868fb39a6154d016a0f7
-  data.tar.gz: 7b3bf8f227f97efb5e4a6cb8d80d9e5ef4a2c1f29e8978fadb95597b419010f1abeaf8650bdbc533389fd09746aeae597fc97447ec2b7e46507f36cff180dc58
+  metadata.gz: c638316ab0058cea04174eaecc228352bc7710935d57d230362908ed86854fcb53e9aa0236d1003a0d0ebaeeecaa34a7735db20a15e40862242f7aecbcde88b2
+  data.tar.gz: c9cd6ea00208e8a7cb0e9d3855886fd2776e8f0d7b60a2fb4a3521ab1051db3d37ea435c44b538215618498197276e83158e05a7b6ea36e29df66c9cac265a5c

data/flexmock.gemspec

@@ -19,7 +19,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', ">= 5.0"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov', '>= 0.11.0'
-  s.add_development_dependency 'coveralls'
 
   #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
 

data/lib/flexmock/core.rb

@@ -147,7 +147,7 @@ class FlexMock
       if flexmock_closed?
         FlexMock.undefined
       elsif exp = flexmock_expectations_for(sym)
-        exp.call(enhanced_args, call_record)
+        exp.call(args, block, call_record)
       elsif @base_class && @base_class.flexmock_defined?(sym)
         FlexMock.undefined
       elsif @ignore_missing
@@ -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

@@ -37,6 +37,8 @@ class FlexMock
       @sym = sym
       @location = location
       @expected_args = nil
+      @expected_kw_args = nil
+      @expected_block = nil
       @count_validators = []
       @signature_validator = SignatureValidator.new(self)
       @count_validator_class = ExactCountValidator
@@ -61,7 +63,7 @@ class FlexMock
     # * call count validators
     #
     def description
-      result = "should_receive(#{@sym.inspect})"
+      result = ["should_receive(#{@sym.inspect})"]
       result << ".with(#{FlexMock.format_args(@expected_args)})" if @expected_args
       @count_validators.each do |validator|
         result << validator.describe
@@ -69,7 +71,7 @@ class FlexMock
       if !@signature_validator.null?
         result << @signature_validator.describe
       end
-      result
+      result.join
     end
 
     # Validate that this expectation is eligible for an extra call
@@ -91,42 +93,55 @@ class FlexMock
 
     # Verify the current call with the given arguments matches the
     # expectations recorded in this object.
-    def verify_call(*args)
+    def verify_call(*args, &block)
       validate_eligible
       validate_order
-      validate_signature(args)
+      enhanced_args =
+        if block
+          args + [block]
+        else
+          args
+        end
+
+      validate_signature(enhanced_args)
       @actual_count += 1
-      perform_yielding(args)
-      return_value(args)
+      perform_yielding(args, block)
+      return_value(args, block)
     end
 
     # Public return value (odd name to avoid accidental use as a
     # constraint).
-    def _return_value(args) # :nodoc:
-      return_value(args)
+    def _return_value(args, block) # :nodoc:
+      return_value(args, block)
     end
 
     # Find the return value for this expectation. (private version)
-    def return_value(args)
+    def return_value(args, block)
       case @return_queue.size
       when 0
-        block = lambda { |*a| @return_value }
+        ret_block = lambda { |*a| @return_value }
       when 1
-        block = @return_queue.first
+        ret_block = @return_queue.first
       else
-        block = @return_queue.shift
+        ret_block = @return_queue.shift
+      end
+
+      if @expected_block
+        ret_block.call(*args, &block)
+      elsif block
+        ret_block.call(*args, block)
+      else
+        ret_block.call(*args)
       end
-      block.call(*args)
     end
     private :return_value
 
     # Yield stored values to any blocks given.
-    def perform_yielding(args)
+    def perform_yielding(args, block)
       @return_value = nil
       unless @yield_queue.empty?
-        block = args.last
         values = (@yield_queue.size == 1) ? @yield_queue.first : @yield_queue.shift
-        if block && block.respond_to?(:call)
+        if block
           values.each do |v|
             @return_value = block.call(*v)
           end
@@ -171,7 +186,38 @@ class FlexMock
     # Does the argument list match this expectation's argument
     # specification.
     def match_args(args)
-      ArgumentMatching.all_match?(@expected_args, args)
+      expected_args =
+        if @expected_kw_args
+          if proc_matcher?(@expected_args&.last) && @expected_block.nil?
+            @expected_args[0..-2] + [@expected_kw_args, @expected_args[-1]]
+          else
+            (@expected_args || []) + [@expected_kw_args]
+          end
+        else
+          @expected_args
+        end
+
+      if @expected_block
+        expected_args = (expected_args || []) + [@expected_block]
+      end
+
+      ArgumentMatching.all_match?(expected_args, args)
+    end
+
+    def proc_matcher?(obj)
+      obj == Proc || obj == OPTIONAL_PROC_MATCHER
+    end
+
+    def with_optional_block
+      @expected_block = OPTIONAL_PROC_MATCHER
+    end
+
+    def with_block
+      @expected_block = Proc
+    end
+
+    def with_no_block
+      @expected_block = false
     end
 
     # Declare that the method should expect the given argument list.
@@ -192,6 +238,20 @@ class FlexMock
       self
     end
 
+    # Declare that the method can be called with any number of
+    # arguments of any type.
+    def with_kw_args(matcher)
+      @expected_kw_args = matcher
+      self
+    end
+
+    # Declare that the method can be called with any number of
+    # arguments of any type.
+    def with_any_kw_args
+      @expected_kw_args = FlexMock.any
+      self
+    end
+
     # Validate general parameters on the call signature
     def with_signature(
         required_arguments: 0, optional_arguments: 0, splat: false,
@@ -345,9 +405,9 @@ 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))
+          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}"

data/lib/flexmock/expectation_builder.rb

@@ -86,7 +86,7 @@ class FlexMock
       names.each do |name|
         exp = mock.flexmock_find_expectation(name)
         if exp
-          next_mock = exp._return_value([])
+          next_mock = exp._return_value([], nil)
           check_proper_mock(next_mock, name)
         else
           next_mock = container.flexmock("demeter_#{name}")

data/lib/flexmock/expectation_director.rb

@@ -35,8 +35,10 @@ class FlexMock
     # but at least we will get a good failure message).  Finally,
     # check for expectations that don't have any argument matching
     # criteria.
-    def call(args, call_record=nil)
-      exp = find_expectation(*args)
+    def call(args, block = nil, call_record=nil)
+      find_args = args.dup
+      find_args << block if block
+      exp = find_expectation(*find_args)
       call_record.expectation = exp if call_record
       FlexMock.check(
         proc { "no matching handler found for " +
@@ -44,7 +46,7 @@ class FlexMock
                "\nDefined expectations:\n  " +
                @expectations.map(&:description).join("\n  ") }
       ) { !exp.nil? }
-      returned_value = exp.verify_call(*args)
+      returned_value = exp.verify_call(*args, &block)
       returned_value
     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.3.8"
+    VERSION = "2.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.4.1
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: "\n    FlexMock is a extremely simple mock object class compatible\n
   \   with the Minitest framework.  Although the FlexMock's\n    interface is simple,
   it is very flexible.\n  "