flexmock 2.4.5 → 3.0.0

data/lib/flexmock/validators.rb

@@ -212,74 +212,28 @@ class FlexMock
     #
     # @param [Array] args
     # @raise ValidationFailed
-    def validate(args)
-      args = args.dup
-      kw_args = Hash.new
-
-      last_is_proc = false
-      begin
-        if args.last.kind_of?(Proc)
-          args.pop
-          last_is_proc = true
-        end
-      rescue NoMethodError
-      end
-
-      last_is_kw_hash = false
-      if expects_keyword_arguments?
-        last_is_kw_hash =
-          begin
-            args.last.kind_of?(Hash)
-          rescue NoMethodError
-          end
+    def validate(args, kw, block)
+      kw ||= Hash.new
 
-        if last_is_kw_hash
-          kw_args = args.pop
-        elsif requires_keyword_arguments?
-          raise ValidationFailed, "#{@exp} expects keyword arguments but none were provided"
-        end
+      if expects_keyword_arguments? && requires_keyword_arguments? && kw.empty?
+        raise ValidationFailed, "#{@exp} expects keyword arguments but none were provided"
       end
 
-      # There is currently no way to disambiguate "given a block" from "given a
-      # proc as last argument" ... give some leeway in this case
-      positional_count = args.size
-
-      if required_arguments > positional_count
-        if requires_keyword_arguments?
-          raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{positional_count}"
-        end
-
-        if (required_arguments - positional_count) == 1 && (last_is_kw_hash || last_is_proc)
-          if last_is_kw_hash
-            last_is_kw_hash = false
-            kw_args = Hash.new
-          else
-            last_is_proc = false
-          end
-          positional_count += 1
-        elsif (required_arguments - positional_count) == 2 && (last_is_kw_hash && last_is_proc)
-          last_is_kw_hash = false
-          kw_args = Hash.new
-          last_is_proc = false
-          positional_count += 2
-        else
-          raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{positional_count}"
-        end
+      if required_arguments > args.size
+        raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{args.size}"
       end
 
-      if !splat? && (required_arguments + optional_arguments) < positional_count
-        if !last_is_proc || (required_arguments + optional_arguments) < positional_count - 1
-          raise ValidationFailed, "#{@exp} expects at most #{required_arguments + optional_arguments} positional arguments but got #{positional_count}"
-        end
+      if !splat? && (required_arguments + optional_arguments) < args.size
+        raise ValidationFailed, "#{@exp} expects at most #{required_arguments + optional_arguments} positional arguments but got #{args.size}"
       end
 
       missing_keyword_arguments = required_keyword_arguments.
-        find_all { |k| !kw_args.has_key?(k) }
+        find_all { |k| !kw.has_key?(k) }
       if !missing_keyword_arguments.empty?
         raise ValidationFailed, "#{@exp} missing required keyword arguments #{missing_keyword_arguments.map(&:to_s).sort.join(", ")}"
       end
       if !keyword_splat?
-        kw_args.each_key do |k|
+        kw.each_key do |k|
           if !optional_keyword_arguments.include?(k) && !required_keyword_arguments.include?(k)
             raise ValidationFailed, "#{@exp} given unexpected keyword argument #{k}"
           end
@@ -313,4 +267,3 @@ class FlexMock
     end
   end
 end
-

data/lib/flexmock/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Jim Weirich
 - Sylvain Joyeux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-14 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -157,7 +157,7 @@ homepage: https://github.com/doudou/flexmock
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,15 +165,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing
 test_files: []