mocha 2.7.1 → 3.0.0.pre.rc.1

data/lib/mocha/name.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Mocha
+  class Name
+    def initialize(name)
+      @name = name.to_s
+    end
+
+    def mocha_inspect
+      "#<Mock:#{@name}>"
+    end
+  end
+end

data/lib/mocha/not_initialized_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/error_with_filtered_backtrace'
 
 module Mocha

data/lib/mocha/object_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/mockery'
 require 'mocha/instance_method'
 require 'mocha/argument_iterator'
@@ -12,7 +14,7 @@ module Mocha
     alias_method :_method, :method
 
     # @private
-    def mocha(instantiate = true)
+    def mocha(instantiate: true)
       if instantiate
         @mocha ||= Mocha::Mockery.instance.mock_impersonating(self)
       else
@@ -75,11 +77,11 @@ module Mocha
       if frozen?
         raise StubbingError.new("can't stub method on frozen object: #{mocha_inspect}", caller)
       end
+
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(expected_methods_vs_return_values)
-      iterator.each do |*args|
-        method_name = args.shift
+      iterator.each do |method_name, *args|
         mockery.on_stubbing(self, method_name)
         method = stubba_method.new(stubba_object, method_name)
         mockery.stubba.stub(method)
@@ -121,11 +123,11 @@ module Mocha
       if frozen?
         raise StubbingError.new("can't stub method on frozen object: #{mocha_inspect}", caller)
       end
+
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(stubbed_methods_vs_return_values)
-      iterator.each do |*args|
-        method_name = args.shift
+      iterator.each do |method_name, *args|
         mockery.on_stubbing(self, method_name)
         method = stubba_method.new(stubba_object, method_name)
         mockery.stubba.stub(method)

data/lib/mocha/object_receiver.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Mocha
+  class ObjectReceiver
+    def initialize(object)
+      @object = object
+    end
+
+    def mocks
+      object = @object
+      mocks = []
+      while object
+        mocha = object.mocha(instantiate: false)
+        mocks << mocha if mocha
+        object = object.is_a?(Class) ? object.superclass : nil
+      end
+      mocks
+    end
+  end
+end

data/lib/mocha/parameter_matchers/all_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -25,7 +27,9 @@ module Mocha
     end
 
     # Parameter matcher which combines a number of other matchers using a logical AND.
-    class AllOf < Base
+    class AllOf
+      include Base
+
       # @private
       def initialize(*matchers)
         @matchers = matchers

data/lib/mocha/parameter_matchers/any_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -31,7 +33,9 @@ module Mocha
     end
 
     # Parameter matcher which combines a number of other matchers using a logical OR.
-    class AnyOf < Base
+    class AnyOf
+      include Base
+
       # @private
       def initialize(*matchers)
         @matchers = matchers

data/lib/mocha/parameter_matchers/any_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -23,7 +25,9 @@ module Mocha
     end
 
     # Parameter matcher which always matches whatever the parameters.
-    class AnyParameters < Base
+    class AnyParameters
+      include Base
+
       # @private
       def matches?(available_parameters)
         until available_parameters.empty?

data/lib/mocha/parameter_matchers/anything.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -20,7 +22,9 @@ module Mocha
     end
 
     # Parameter matcher which always matches a single parameter.
-    class Anything < Base
+    class Anything
+      include Base
+
       # @private
       def matches?(available_parameters)
         available_parameters.shift

data/lib/mocha/parameter_matchers/base.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Mocha
   module ParameterMatchers
-    # @abstract Subclass and implement +#matches?+ and +#mocha_inspect+ to define a custom matcher. Also add a suitably named instance method to {ParameterMatchers} to build an instance of the new matcher c.f. {#equals}.
-    class Base
+    # @abstract Include and implement +#matches?+ and +#mocha_inspect+ to define a custom matcher. Also add a suitably named instance method to {ParameterMatchers} to build an instance of the new matcher c.f. {#equals}.
+    module Base
       # A shorthand way of combining two matchers when both must match.
       #
       # Returns a new {AllOf} parameter matcher combining two matchers using a logical AND.

data/lib/mocha/parameter_matchers/equals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter equals expected value.
-    class Equals < Base
+    class Equals
+      include Base
+
       # @private
       def initialize(value)
         @value = value

data/lib/mocha/parameter_matchers/equivalent_uri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'uri'
 require 'cgi'
@@ -27,7 +29,9 @@ module Mocha
     end
 
     # Parameter matcher which matches URIs with equivalent query strings.
-    class EquivalentUri < Base
+    class EquivalentUri
+      include Base
+
       # @private
       def initialize(uri)
         @uri = URI.parse(uri)

data/lib/mocha/parameter_matchers/has_entries.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'mocha/parameter_matchers/all_of'
 require 'mocha/parameter_matchers/has_entry'
@@ -28,7 +30,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter contains all expected +Hash+ entries.
-    class HasEntries < Base
+    class HasEntries
+      include Base
+
       # @private
       def initialize(entries, exact: false)
         @entries = entries

data/lib/mocha/parameter_matchers/has_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -55,7 +57,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter contains expected +Hash+ entry.
-    class HasEntry < Base
+    class HasEntry
+      include Base
+
       # @private
       def initialize(key, value)
         @key = key
@@ -66,6 +70,7 @@ module Mocha
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:keys) && parameter.respond_to?(:[])
+
         matching_keys = parameter.keys.select { |key| @key.to_matcher.matches?([key]) }
         matching_keys.any? { |key| @value.to_matcher.matches?([parameter[key]]) }
       end

data/lib/mocha/parameter_matchers/has_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter contains +Hash+ entry with expected key.
-    class HasKey < Base
+    class HasKey
+      include Base
+
       # @private
       def initialize(key)
         @key = key
@@ -36,6 +40,7 @@ module Mocha
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:keys)
+
         parameter.keys.any? { |key| @key.to_matcher.matches?([key]) }
       end
 

data/lib/mocha/parameter_matchers/has_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter contains +Hash+ with all expected keys.
-    class HasKeys < Base
+    class HasKeys
+      include Base
+
       # @private
       def initialize(*keys)
         raise ArgumentError, 'No arguments. Expecting at least one.' if keys.empty?
@@ -46,7 +50,7 @@ module Mocha
 
       # @private
       def mocha_inspect
-        "has_keys(#{@keys.mocha_inspect(false)})"
+        "has_keys(#{@keys.mocha_inspect(wrapped: false)})"
       end
     end
   end

data/lib/mocha/parameter_matchers/has_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter contains +Hash+ entry with expected value.
-    class HasValue < Base
+    class HasValue
+      include Base
+
       # @private
       def initialize(value)
         @value = value
@@ -36,6 +40,7 @@ module Mocha
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:values)
+
         parameter.values.any? { |value| @value.to_matcher.matches?([value]) }
       end
 

data/lib/mocha/parameter_matchers/includes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/all_of'
 require 'mocha/parameter_matchers/base'
 
@@ -65,32 +67,31 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter includes expected values.
-    class Includes < Base
+    class Includes
+      include Base
+
       # @private
       def initialize(*items)
         @items = items
       end
 
       # @private
-      # rubocop:disable Metrics/PerceivedComplexity
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:include?)
+
         if @items.size == 1
-          # rubocop:disable Style/GuardClause
           if parameter.respond_to?(:any?) && !parameter.is_a?(String)
             parameter = parameter.keys if parameter.is_a?(Hash)
-            return parameter.any? { |p| @items.first.to_matcher.matches?([p]) }
+            parameter.any? { |p| @items.first.to_matcher.matches?([p]) }
           else
-            return parameter.include?(@items.first)
+            parameter.include?(@items.first)
           end
-          # rubocop:enable Style/GuardClause
         else
           includes_matchers = @items.map { |item| Includes.new(item) }
           AllOf.new(*includes_matchers).matches?([parameter])
         end
       end
-      # rubocop:enable Metrics/PerceivedComplexity
 
       # @private
       def mocha_inspect

data/lib/mocha/parameter_matchers/instance_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'mocha/parameter_matchers/equals'
 require 'mocha/parameter_matchers/positional_or_keyword_hash'
@@ -7,11 +9,11 @@ module Mocha
     # @private
     module InstanceMethods
       # @private
-      def to_matcher(expectation: nil, top_level: false)
+      def to_matcher(expectation: nil, top_level: false, last: false)
         if Base === self
           self
         elsif Hash === self && top_level
-          Mocha::ParameterMatchers::PositionalOrKeywordHash.new(self, expectation)
+          Mocha::ParameterMatchers::PositionalOrKeywordHash.new(self, expectation, last)
         else
           Mocha::ParameterMatchers::Equals.new(self)
         end

data/lib/mocha/parameter_matchers/instance_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter is an instance of the specified class.
-    class InstanceOf < Base
+    class InstanceOf
+      include Base
+
       # @private
       def initialize(klass)
         @klass = klass

data/lib/mocha/parameter_matchers/is_a.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -27,7 +29,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter is a specific class.
-    class IsA < Base
+    class IsA
+      include Base
+
       # @private
       def initialize(klass)
         @klass = klass

data/lib/mocha/parameter_matchers/kind_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches when actual parameter is a kind of specified class.
-    class KindOf < Base
+    class KindOf
+      include Base
+
       # @private
       def initialize(klass)
         @klass = klass

data/lib/mocha/parameter_matchers/not.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which inverts the logic of the specified matcher using a logical NOT operation.
-    class Not < Base
+    class Not
+      include Base
+
       # @private
       def initialize(matcher)
         @matcher = matcher

data/lib/mocha/parameter_matchers/optionally.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   module ParameterMatchers
     # Matches optional parameters if available.
@@ -35,7 +37,9 @@ module Mocha
     end
 
     # Parameter matcher which allows optional parameters to be specified.
-    class Optionally < Base
+    class Optionally
+      include Base
+
       # @private
       def initialize(*parameters)
         @matchers = parameters.map(&:to_matcher)
@@ -47,6 +51,7 @@ module Mocha
         while !available_parameters.empty? && (index < @matchers.length)
           matcher = @matchers[index]
           return false unless matcher.matches?(available_parameters)
+
           index += 1
         end
         true

data/lib/mocha/parameter_matchers/positional_or_keyword_hash.rb

@@ -1,39 +1,64 @@
+# frozen_string_literal: true
+
 require 'mocha/configuration'
 require 'mocha/deprecation'
+require 'mocha/ruby_version'
 require 'mocha/parameter_matchers/base'
 require 'mocha/parameter_matchers/has_entries'
 
 module Mocha
   module ParameterMatchers
     # @private
-    class PositionalOrKeywordHash < Base
-      def initialize(value, expectation)
-        @value = value
+    class PositionalOrKeywordHash
+      include Base
+
+      def initialize(expected_value, expectation, last_expected_value)
+        @expected_value = expected_value
         @expectation = expectation
+        @last_expected_value = last_expected_value
       end
 
-      def matches?(available_parameters)
-        parameter, is_last_parameter = extract_parameter(available_parameters)
-
-        return false unless HasEntries.new(@value, exact: true).matches?([parameter])
+      def matches?(actual_values)
+        actual_value, is_last_actual_value = extract_actual_value(actual_values)
 
-        if is_last_parameter && !same_type_of_hash?(parameter, @value)
-          return false if Mocha.configuration.strict_keyword_argument_matching?
-
-          deprecation_warning(parameter, @value) if Mocha::RUBY_V27_PLUS
+        if !matches_entries_exactly?(actual_value)
+          false
+        elsif is_last_actual_value
+          matches_last_actual_value?(actual_value)
+        else
+          true
         end
-
-        true
       end
 
       def mocha_inspect
-        @value.mocha_inspect
+        @expected_value.mocha_inspect
       end
 
       private
 
-      def extract_parameter(available_parameters)
-        [available_parameters.shift, available_parameters.empty?]
+      def matches_entries_exactly?(actual_value)
+        HasEntries.new(@expected_value, exact: true).matches?([actual_value])
+      end
+
+      def matches_last_actual_value?(actual_value)
+        if same_type_of_hash?(actual_value, @expected_value)
+          true
+        elsif last_expected_value_is_positional_hash? # rubocop:disable Lint/DuplicateBranch
+          true
+        elsif Mocha.configuration.strict_keyword_argument_matching?
+          false
+        else
+          deprecation_warning(actual_value, @expected_value) if Mocha::RUBY_V27_PLUS
+          true
+        end
+      end
+
+      def last_expected_value_is_positional_hash?
+        @last_expected_value && !ruby2_keywords_hash?(@expected_value)
+      end
+
+      def extract_actual_value(actual_values)
+        [actual_values.shift, actual_values.empty?]
       end
 
       def same_type_of_hash?(actual, expected)

data/lib/mocha/parameter_matchers/regexp_matches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches if specified regular expression matches actual paramter.
-    class RegexpMatches < Base
+    class RegexpMatches
+      include Base
+
       # @private
       def initialize(regexp)
         @regexp = regexp
@@ -36,6 +40,7 @@ module Mocha
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:=~)
+
         parameter =~ @regexp
       end
 

data/lib/mocha/parameter_matchers/responds_with.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'mocha/parameter_matchers/all_of'
 require 'yaml'
@@ -54,7 +56,9 @@ module Mocha
     end
 
     # Parameter matcher which matches if actual parameter returns expected result when specified method is invoked.
-    class RespondsWith < Base
+    class RespondsWith
+      include Base
+
       # @private
       def initialize(message, result)
         @message = message

data/lib/mocha/parameter_matchers/yaml_equivalent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'yaml'
 
@@ -26,7 +28,9 @@ module Mocha
     end
 
     # Parameter matcher which matches if actual parameter is YAML equivalent of specified object.
-    class YamlEquivalent < Base
+    class YamlEquivalent
+      include Base
+
       # @private
       def initialize(object)
         @object = object

data/lib/mocha/parameter_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   # Used as parameters for {Expectation#with} to restrict the parameter values which will match the expectation. Can be nested.
   module ParameterMatchers; end

data/lib/mocha/parameters_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/inspect'
 require 'mocha/parameter_matchers'
 
@@ -32,7 +34,13 @@ module Mocha
     end
 
     def matchers
-      @expected_parameters.map { |p| p.to_matcher(expectation: @expectation, top_level: true) }
+      @expected_parameters.map.with_index do |parameter, index|
+        parameter.to_matcher(
+          expectation: @expectation,
+          top_level: true,
+          last: index == @expected_parameters.length - 1
+        )
+      end
     end
   end
 end

data/lib/mocha/raised_exception.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class RaisedException
     def initialize(exception)

data/lib/mocha/return_values.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/single_return_value'
 
 module Mocha

data/lib/mocha/ruby_version.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Mocha
   RUBY_V27_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.7')
+  RUBY_V30_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('3.0')
   RUBY_V34_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('3.4')
 end