mocha 1.5.0 → 1.10.0

data/lib/mocha/parameter_matchers/instance_methods.rb

@@ -0,0 +1,18 @@
+require 'mocha/parameter_matchers/equals'
+
+module Mocha
+  module ParameterMatchers
+    # @private
+    module InstanceMethods
+      # @private
+      def to_matcher
+        Mocha::ParameterMatchers::Equals.new(self)
+      end
+    end
+  end
+end
+
+# @private
+class Object
+  include Mocha::ParameterMatchers::InstanceMethods
+end

data/lib/mocha/parameter_matchers/instance_of.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any object that is an instance of +klass+
     #
     # @param [Class] klass expected class.
@@ -29,7 +27,6 @@ module Mocha
 
     # Parameter matcher which matches when actual parameter is an instance of the specified class.
     class InstanceOf < Base
-
       # @private
       def initialize(klass)
         @klass = klass
@@ -45,9 +42,6 @@ module Mocha
       def mocha_inspect
         "instance_of(#{@klass.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/is_a.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any object that is a +klass+.
     #
     # @param [Class] klass expected class.
@@ -23,13 +21,14 @@ module Mocha
     #   object.expects(:method_1).with(is_a(Integer))
     #   object.method_1('string')
     #   # error raised, because method_1 was not called with an Integer
+    # rubocop:disable Naming/PredicateName
     def is_a(klass)
       IsA.new(klass)
     end
+    # rubocop:enable Naming/PredicateName
 
     # Parameter matcher which matches when actual parameter is a specific class.
     class IsA < Base
-
       # @private
       def initialize(klass)
         @klass = klass
@@ -45,9 +44,6 @@ module Mocha
       def mocha_inspect
         "is_a(#{@klass.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/kind_of.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any +Object+ that is a kind of +klass+.
     #
     # @param [Class] klass expected class.
@@ -29,7 +27,6 @@ module Mocha
 
     # Parameter matcher which matches when actual parameter is a kind of specified class.
     class KindOf < Base
-
       # @private
       def initialize(klass)
         @klass = klass
@@ -38,16 +35,15 @@ module Mocha
       # @private
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        # rubocop:disable Style/ClassCheck
         parameter.kind_of?(@klass)
+        # rubocop:enable Style/ClassCheck
       end
 
       # @private
       def mocha_inspect
         "kind_of(#{@klass.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/not.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches if +matcher+ does *not* match.
     #
     # @param [Base] matcher matcher whose logic to invert.
@@ -22,13 +20,14 @@ module Mocha
     #   object.expects(:method_1).with(Not(includes(1)))
     #   object.method_1([0, 1, 2, 3])
     #   # error raised, because method_1 was not called with object not including 1
+    # rubocop:disable Naming/MethodName
     def Not(matcher)
       Not.new(matcher)
     end
+    # rubocop:enable Naming/MethodName
 
     # Parameter matcher which inverts the logic of the specified matcher using a logical NOT operation.
     class Not < Base
-
       # @private
       def initialize(matcher)
         @matcher = matcher
@@ -44,9 +43,6 @@ module Mocha
       def mocha_inspect
         "Not(#{@matcher.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/optionally.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   module ParameterMatchers
-
     # Matches optional parameters if available.
     #
     # @param [*Array<Base>] matchers matchers for optional parameters.
@@ -38,30 +36,26 @@ module Mocha
 
     # Parameter matcher which allows optional parameters to be specified.
     class Optionally < Base
-
       # @private
       def initialize(*parameters)
-        @matchers = parameters.map { |parameter| parameter.to_matcher }
+        @matchers = parameters.map(&:to_matcher)
       end
 
       # @private
       def matches?(available_parameters)
         index = 0
-        while (available_parameters.length > 0) && (index < @matchers.length) do
+        while !available_parameters.empty? && (index < @matchers.length)
           matcher = @matchers[index]
           return false unless matcher.matches?(available_parameters)
           index += 1
         end
-        return true
+        true
       end
 
       # @private
       def mocha_inspect
-        "optionally(#{@matchers.map { |matcher| matcher.mocha_inspect }.join(", ") })"
+        "optionally(#{@matchers.map(&:mocha_inspect).join(', ')})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/regexp_matches.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any object that matches +regexp+.
     #
     # @param [Regexp] regexp regular expression to match.
@@ -29,7 +27,6 @@ module Mocha
 
     # Parameter matcher which matches if specified regular expression matches actual paramter.
     class RegexpMatches < Base
-
       # @private
       def initialize(regexp)
         @regexp = regexp
@@ -46,9 +43,6 @@ module Mocha
       def mocha_inspect
         "regexp_matches(#{@regexp.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/responds_with.rb

@@ -2,9 +2,7 @@ require 'mocha/parameter_matchers/base'
 require 'yaml'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any object that responds to +message+ with +result+. To put it another way, it tests the quack, not the duck.
     #
     # @param [Symbol] message method to invoke.
@@ -30,25 +28,22 @@ module Mocha
 
     # Parameter matcher which matches if actual parameter returns expected result when specified method is invoked.
     class RespondsWith < Base
-
       # @private
       def initialize(message, result)
-        @message, @result = message, result
+        @message = message
+        @result = result
       end
 
       # @private
       def matches?(available_parameters)
         parameter = available_parameters.shift
-        @result.to_matcher.matches?( [parameter.__send__(@message)] )
+        @result.to_matcher.matches?([parameter.__send__(@message)])
       end
 
       # @private
       def mocha_inspect
         "responds_with(#{@message.mocha_inspect}, #{@result.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/yaml_equivalent.rb

@@ -2,9 +2,7 @@ require 'mocha/parameter_matchers/base'
 require 'yaml'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any YAML that represents the specified +object+
     #
     # @param [Object] object object whose YAML to compare.
@@ -29,7 +27,6 @@ module Mocha
 
     # Parameter matcher which matches if actual parameter is YAML equivalent of specified object.
     class YamlEquivalent < Base
-
       # @private
       def initialize(object)
         @object = object
@@ -38,16 +35,15 @@ module Mocha
       # @private
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        # rubocop:disable Security/YAMLLoad
         @object == YAML.load(parameter)
+        # rubocop:enable Security/YAMLLoad
       end
 
       # @private
       def mocha_inspect
         "yaml_equivalent(#{@object.mocha_inspect})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameters_matcher.rb

@@ -2,23 +2,22 @@ require 'mocha/inspect'
 require 'mocha/parameter_matchers'
 
 module Mocha
-
   class ParametersMatcher
-
     def initialize(expected_parameters = [ParameterMatchers::AnyParameters.new], &matching_block)
-      @expected_parameters, @matching_block = expected_parameters, matching_block
+      @expected_parameters = expected_parameters
+      @matching_block = matching_block
     end
 
     def match?(actual_parameters = [])
       if @matching_block
-        return @matching_block.call(*actual_parameters)
+        @matching_block.call(*actual_parameters)
       else
-        return parameters_match?(actual_parameters)
+        parameters_match?(actual_parameters)
       end
     end
 
     def parameters_match?(actual_parameters)
-      matchers.all? { |matcher| matcher.matches?(actual_parameters) } && (actual_parameters.length == 0)
+      matchers.all? { |matcher| matcher.matches?(actual_parameters) } && actual_parameters.empty?
     end
 
     def mocha_inspect
@@ -29,9 +28,7 @@ module Mocha
     end
 
     def matchers
-      @expected_parameters.map { |parameter| parameter.to_matcher }
+      @expected_parameters.map(&:to_matcher)
     end
-
   end
-
 end

data/lib/mocha/pretty_parameters.rb

@@ -1,9 +1,7 @@
 require 'mocha/inspect'
 
 module Mocha
-
   class PrettyParameters
-
     def initialize(params)
       @params = params
       @params_string = params.mocha_inspect
@@ -22,7 +20,5 @@ module Mocha
     def remove_outer_hash_braces!
       @params_string = @params_string.gsub(/^\{|\}$/, '') if @params.length == 1
     end
-
   end
-
 end

data/lib/mocha/raised_exception.rb

@@ -0,0 +1,11 @@
+module Mocha
+  class RaisedException
+    def initialize(exception)
+      @exception = exception
+    end
+
+    def mocha_inspect
+      "raised #{@exception}"
+    end
+  end
+end

data/lib/mocha/receivers.rb

@@ -1,41 +1,39 @@
 module Mocha
-
   class ObjectReceiver
-
     def initialize(object)
       @object = object
     end
 
     def mocks
-      object, mocks = @object, []
-      while object do
-        mocks << object.mocha
+      object = @object
+      mocks = []
+      while object
+        mocha = object.mocha(false)
+        mocks << mocha if mocha
         object = object.is_a?(Class) ? object.superclass : nil
       end
       mocks
     end
-
   end
 
   class AnyInstanceReceiver
-
     def initialize(klass)
       @klass = klass
     end
 
     def mocks
-      klass, mocks = @klass, []
-      while klass do
-        mocks << klass.any_instance.mocha
+      klass = @klass
+      mocks = []
+      while klass
+        mocha = klass.any_instance.mocha(false)
+        mocks << mocha if mocha
         klass = klass.superclass
       end
       mocks
     end
-
   end
 
   class DefaultReceiver
-
     def initialize(mock)
       @mock = mock
     end
@@ -43,7 +41,5 @@ module Mocha
     def mocks
       [@mock]
     end
-
   end
-
 end

data/lib/mocha/return_values.rb

@@ -1,9 +1,7 @@
 require 'mocha/single_return_value'
 
 module Mocha
-
   class ReturnValues
-
     def self.build(*values)
       new(*values.map { |value| SingleReturnValue.new(value) })
     end
@@ -14,18 +12,16 @@ module Mocha
       @values = values
     end
 
-    def next
+    def next(invocation)
       case @values.length
-        when 0 then nil
-        when 1 then @values.first.evaluate
-        else @values.shift.evaluate
+      when 0 then nil
+      when 1 then @values.first.evaluate(invocation)
+      else @values.shift.evaluate(invocation)
       end
     end
 
     def +(other)
       self.class.new(*(@values + other.values))
     end
-
   end
-
 end