mocha 2.8.0 → 3.0.0.pre.rc.2

data/lib/mocha/parameter_matchers/equivalent_uri.rb

@@ -1,7 +1,7 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 require 'uri'
-require 'cgi'
 
 module Mocha
   module ParameterMatchers
@@ -15,13 +15,13 @@ module Mocha
       #
       # @example Actual URI is equivalent.
       #   object = mock()
-      #   object.expects(:method_1).with(equivalent_uri('http://example.com/foo?a=1&b=2))
+      #   object.expects(:method_1).with(equivalent_uri('http://example.com/foo?a=1&b=2'))
       #   object.method_1('http://example.com/foo?b=2&a=1')
       #   # no error raised
       #
       # @example Actual URI is not equivalent.
       #   object = mock()
-      #   object.expects(:method_1).with(equivalent_uri('http://example.com/foo?a=1&b=2))
+      #   object.expects(:method_1).with(equivalent_uri('http://example.com/foo?a=1&b=2'))
       #   object.method_1('http://example.com/foo?a=1&b=3')
       #   # error raised, because the query parameters were different
       def equivalent_uri(uri)
@@ -29,8 +29,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:equivalent_uri)
-
     # Parameter matcher which matches URIs with equivalent query strings.
     class EquivalentUri
       include BaseMethods
@@ -56,11 +54,12 @@ module Mocha
 
       # @private
       def explode(uri)
-        query_hash = CGI.parse(uri.query || '')
+        query_hash = Hash.new { |hash, key| hash[key] = [] }
+        URI.decode_www_form(uri.query || '').each do |key, value|
+          query_hash[key] << value
+        end
         URI::Generic::COMPONENT.inject({}) { |h, k| h.merge(k => uri.__send__(k)) }.merge(query: query_hash)
       end
     end
-
-    provide_deprecated_access_to(:EquivalentUri)
   end
 end

data/lib/mocha/parameter_matchers/has_entries.rb

@@ -1,7 +1,8 @@
-require 'mocha/parameter_matchers/base'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 require 'mocha/parameter_matchers/all_of'
 require 'mocha/parameter_matchers/has_entry'
-require 'mocha/parameter_matchers/deprecations'
 
 module Mocha
   module ParameterMatchers
@@ -25,13 +26,11 @@ module Mocha
       #   object.method_1('key_1' => 1, 'key_2' => 99)
       #   # error raised, because method_1 was not called with Hash containing entries: 'key_1' => 1, 'key_2' => 2
       #
-      def has_entries(entries) # rubocop:disable Naming/PredicateName
+      def has_entries(entries) # rubocop:disable Naming/PredicatePrefix
         HasEntries.new(entries)
       end
     end
 
-    define_deprecated_matcher_method(:has_entries)
-
     # Parameter matcher which matches when actual parameter contains all expected +Hash+ entries.
     class HasEntries
       include BaseMethods
@@ -58,7 +57,5 @@ module Mocha
         @exact ? @entries.mocha_inspect : "has_entries(#{@entries.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:HasEntries)
   end
 end

data/lib/mocha/parameter_matchers/has_entry.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -42,7 +43,7 @@ module Mocha
       #   object.method_1('key_1' => 2, 'key_2' => 1)
       #   # error raised, because method_1 was not called with Hash containing entry: 'key_1' => 1
       #
-      def has_entry(*options) # rubocop:disable Naming/PredicateName
+      def has_entry(*options) # rubocop:disable Naming/PredicatePrefix
         case options.length
         when 0
           raise ArgumentError, 'No arguments. Expecting at least one.'
@@ -57,8 +58,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:has_entry)
-
     # Parameter matcher which matches when actual parameter contains expected +Hash+ entry.
     class HasEntry
       include BaseMethods
@@ -73,6 +72,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
@@ -99,7 +99,5 @@ module Mocha
         end
       end
     end
-
-    provide_deprecated_access_to(:HasEntry)
   end
 end

data/lib/mocha/parameter_matchers/has_key.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -23,13 +24,11 @@ module Mocha
       #   object.method_1('key_2' => 2)
       #   # error raised, because method_1 was not called with Hash containing key: 'key_1'
       #
-      def has_key(key) # rubocop:disable Naming/PredicateName
+      def has_key(key) # rubocop:disable Naming/PredicatePrefix
         HasKey.new(key)
       end
     end
 
-    define_deprecated_matcher_method(:has_key)
-
     # Parameter matcher which matches when actual parameter contains +Hash+ entry with expected key.
     class HasKey
       include BaseMethods
@@ -43,6 +42,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
 
@@ -51,7 +51,5 @@ module Mocha
         "has_key(#{@key.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:HasKey)
   end
 end

data/lib/mocha/parameter_matchers/has_keys.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -23,13 +24,11 @@ module Mocha
       #   object.method_1(:key_2 => 2)
       #   # error raised, because method_1 was not called with Hash containing key: :key_1
       #
-      def has_keys(*keys) # rubocop:disable Naming/PredicateName
+      def has_keys(*keys) # rubocop:disable Naming/PredicatePrefix
         HasKeys.new(*keys)
       end
     end
 
-    define_deprecated_matcher_method(:has_keys)
-
     # Parameter matcher which matches when actual parameter contains +Hash+ with all expected keys.
     class HasKeys
       include BaseMethods
@@ -53,10 +52,8 @@ module Mocha
 
       # @private
       def mocha_inspect
-        "has_keys(#{@keys.mocha_inspect(false)})"
+        "has_keys(#{@keys.mocha_inspect(wrapped: false)})"
       end
     end
-
-    provide_deprecated_access_to(:HasKeys)
   end
 end

data/lib/mocha/parameter_matchers/has_value.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -23,13 +24,11 @@ module Mocha
       #   object.method_1('key_2' => 2)
       #   # error raised, because method_1 was not called with Hash containing value: 1
       #
-      def has_value(value) # rubocop:disable Naming/PredicateName
+      def has_value(value) # rubocop:disable Naming/PredicatePrefix
         HasValue.new(value)
       end
     end
 
-    define_deprecated_matcher_method(:has_value)
-
     # Parameter matcher which matches when actual parameter contains +Hash+ entry with expected value.
     class HasValue
       include BaseMethods
@@ -43,6 +42,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
 
@@ -51,7 +51,5 @@ module Mocha
         "has_value(#{@value.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:HasValue)
   end
 end

data/lib/mocha/parameter_matchers/includes.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/all_of'
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -67,8 +68,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:includes)
-
     # Parameter matcher which matches when actual parameter includes expected values.
     class Includes
       include BaseMethods
@@ -79,25 +78,22 @@ module Mocha
       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
@@ -105,7 +101,5 @@ module Mocha
         "includes(#{item_descriptions.join(', ')})"
       end
     end
-
-    provide_deprecated_access_to(:Includes)
   end
 end

data/lib/mocha/parameter_matchers/instance_methods.rb

@@ -1,4 +1,6 @@
-require 'mocha/parameter_matchers/base'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 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 is_a?(BaseMethods)
           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,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -28,8 +29,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:instance_of)
-
     # Parameter matcher which matches when actual parameter is an instance of the specified class.
     class InstanceOf
       include BaseMethods
@@ -50,7 +49,5 @@ module Mocha
         "instance_of(#{@klass.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:InstanceOf)
   end
 end

data/lib/mocha/parameter_matchers/is_a.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -24,13 +25,11 @@ module Mocha
       #   object.method_1('string')
       #   # error raised, because method_1 was not called with an Integer
       #
-      def is_a(klass) # rubocop:disable Naming/PredicateName
+      def is_a(klass) # rubocop:disable Naming/PredicatePrefix
         IsA.new(klass)
       end
     end
 
-    define_deprecated_matcher_method(:is_a)
-
     # Parameter matcher which matches when actual parameter is a specific class.
     class IsA
       include BaseMethods
@@ -51,7 +50,5 @@ module Mocha
         "is_a(#{@klass.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:IsA)
   end
 end

data/lib/mocha/parameter_matchers/kind_of.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -28,8 +29,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:kind_of)
-
     # Parameter matcher which matches when actual parameter is a kind of specified class.
     class KindOf
       include BaseMethods
@@ -52,7 +51,5 @@ module Mocha
         "kind_of(#{@klass.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:KindOf)
   end
 end

data/lib/mocha/parameter_matchers/not.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -28,8 +29,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:Not)
-
     # Parameter matcher which inverts the logic of the specified matcher using a logical NOT operation.
     class Not
       include BaseMethods
@@ -50,7 +49,5 @@ module Mocha
         "Not(#{@matcher.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:Not)
   end
 end

data/lib/mocha/parameter_matchers/optionally.rb

@@ -1,4 +1,4 @@
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
 
 module Mocha
   module ParameterMatchers
@@ -38,8 +38,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:optionally)
-
     # Parameter matcher which allows optional parameters to be specified.
     class Optionally
       include BaseMethods
@@ -55,6 +53,7 @@ module Mocha
         while !available_parameters.empty? && (index < @matchers.length)
           matcher = @matchers[index]
           return false unless matcher.matches?(available_parameters)
+
           index += 1
         end
         true
@@ -65,7 +64,5 @@ module Mocha
         "optionally(#{@matchers.map(&:mocha_inspect).join(', ')})"
       end
     end
-
-    provide_deprecated_access_to(:Optionally)
   end
 end

data/lib/mocha/parameter_matchers/positional_or_keyword_hash.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'mocha/configuration'
 require 'mocha/deprecation'
-require 'mocha/parameter_matchers/base'
+require 'mocha/ruby_version'
+require 'mocha/parameter_matchers/base_methods'
 require 'mocha/parameter_matchers/has_entries'
-require 'mocha/parameter_matchers/deprecations'
 
 module Mocha
   module ParameterMatchers
@@ -10,33 +12,53 @@ module Mocha
     class PositionalOrKeywordHash
       include BaseMethods
 
-      def initialize(value, expectation)
-        @value = value
+      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])
-
-        if is_last_parameter && !same_type_of_hash?(parameter, @value)
-          return false if Mocha.configuration.strict_keyword_argument_matching?
+      def matches?(actual_values)
+        actual_value, is_last_actual_value = extract_actual_value(actual_values)
 
-          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)
@@ -65,7 +87,5 @@ module Mocha
         "defined at #{@expectation.definition_location}"
       end
     end
-
-    provide_deprecated_access_to(:PositionalOrKeywordHash)
   end
 end

data/lib/mocha/parameter_matchers/regexp_matches.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 
 module Mocha
   module ParameterMatchers
@@ -28,8 +29,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:regexp_matches)
-
     # Parameter matcher which matches if specified regular expression matches actual paramter.
     class RegexpMatches
       include BaseMethods
@@ -43,6 +42,7 @@ module Mocha
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:=~)
+
         parameter =~ @regexp
       end
 
@@ -51,7 +51,5 @@ module Mocha
         "regexp_matches(#{@regexp.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:RegexpMatches)
   end
 end

data/lib/mocha/parameter_matchers/responds_with.rb

@@ -1,6 +1,7 @@
-require 'mocha/parameter_matchers/base'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 require 'mocha/parameter_matchers/all_of'
-require 'mocha/parameter_matchers/deprecations'
 require 'yaml'
 
 module Mocha
@@ -56,8 +57,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:responds_with)
-
     # Parameter matcher which matches if actual parameter returns expected result when specified method is invoked.
     class RespondsWith
       include BaseMethods
@@ -79,7 +78,5 @@ module Mocha
         "responds_with(#{@message.mocha_inspect}, #{@result.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:RespondsWith)
   end
 end

data/lib/mocha/parameter_matchers/yaml_equivalent.rb

@@ -1,5 +1,6 @@
-require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
+
+require 'mocha/parameter_matchers/base_methods'
 require 'yaml'
 
 module Mocha
@@ -28,8 +29,6 @@ module Mocha
       end
     end
 
-    define_deprecated_matcher_method(:yaml_equivalent)
-
     # Parameter matcher which matches if actual parameter is YAML equivalent of specified object.
     class YamlEquivalent
       include BaseMethods
@@ -52,7 +51,5 @@ module Mocha
         "yaml_equivalent(#{@object.mocha_inspect})"
       end
     end
-
-    provide_deprecated_access_to(:YamlEquivalent)
   end
 end

data/lib/mocha/parameter_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   # Matcher classes used as parameters for {Expectation#with} to restrict the parameter values which will match the expectation. Can be nested. Build matcher instances in tests using methods in {Methods}, e.g. {Methods#includes}.
   module ParameterMatchers
@@ -6,7 +8,6 @@ module Mocha
   end
 end
 
-require 'mocha/parameter_matchers/deprecations'
 require 'mocha/parameter_matchers/instance_methods'
 
 require 'mocha/parameter_matchers/all_of'

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)