mocha 1.4.0 → 1.7.0

data/lib/mocha/parameter_matchers/object.rb

@@ -1,14 +1,12 @@
 require 'mocha/parameter_matchers/equals'
 
 module Mocha
-
   module ObjectMethods
     # @private
     def to_matcher
       Mocha::ParameterMatchers::Equals.new(self)
     end
   end
-
 end
 
 # @private

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/parameter_matchers.rb

@@ -1,8 +1,6 @@
 module Mocha
-
   # Used as parameters for {Expectation#with} to restrict the parameter values which will match the expectation. Can be nested.
   module ParameterMatchers; end
-
 end
 
 require 'mocha/parameter_matchers/object'

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/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
@@ -16,16 +14,14 @@ module Mocha
 
     def next
       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
+      else @values.shift.evaluate
       end
     end
 
     def +(other)
       self.class.new(*(@values + other.values))
     end
-
   end
-
 end

data/lib/mocha/sequence.rb

@@ -1,16 +1,14 @@
 module Mocha
-
   # Used to constrain the order in which expectations can occur.
   #
   # @see API#sequence
   # @see Expectation#in_sequence
   class Sequence
-
     # @private
     class InSequenceOrderingConstraint
-
       def initialize(sequence, index)
-        @sequence, @index = sequence, index
+        @sequence = sequence
+        @index = index
       end
 
       def allows_invocation_now?
@@ -20,7 +18,6 @@ module Mocha
       def mocha_inspect
         "in sequence #{@sequence.mocha_inspect}"
       end
-
     end
 
     # @private
@@ -38,14 +35,12 @@ module Mocha
 
     # @private
     def satisfied_to_index?(index)
-      @expectations[0...index].all? { |expectation| expectation.satisfied? }
+      @expectations[0...index].all?(&:satisfied?)
     end
 
     # @private
     def mocha_inspect
-      "#{@name.mocha_inspect}"
+      @name.mocha_inspect.to_s
     end
-
   end
-
 end

data/lib/mocha/single_return_value.rb

@@ -1,9 +1,7 @@
 require 'mocha/is_a'
 
 module Mocha
-
   class SingleReturnValue
-
     def initialize(value)
       @value = value
     end
@@ -11,7 +9,5 @@ module Mocha
     def evaluate
       @value
     end
-
   end
-
 end

data/lib/mocha/single_yield.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class SingleYield
-
     attr_reader :parameters
 
     def initialize(*parameters)
@@ -11,8 +9,5 @@ module Mocha
     def each
       yield(@parameters)
     end
-
   end
-
 end
-

data/lib/mocha/state_machine.rb

@@ -1,15 +1,13 @@
 module Mocha
-
   # A state machine that is used to constrain the order of invocations.
   # An invocation can be constrained to occur when a state {#is}, or {#is_not}, active.
   class StateMachine
-
     # Provides a mechanism to change the state of a {StateMachine} at some point in the future.
     class State
-
       # @private
       def initialize(state_machine, state)
-        @state_machine, @state = state_machine, state
+        @state_machine = state_machine
+        @state = state
       end
 
       # @private
@@ -26,15 +24,14 @@ module Mocha
       def mocha_inspect
         "#{@state_machine.name} is #{@state.mocha_inspect}"
       end
-
     end
 
     # Provides the ability to determine whether a {StateMachine} is in a specified state at some point in the future.
     class StatePredicate
-
       # @private
       def initialize(state_machine, state)
-        @state_machine, @state = state_machine, state
+        @state_machine = state_machine
+        @state = state
       end
 
       # @private
@@ -46,7 +43,6 @@ module Mocha
       def mocha_inspect
         "#{@state_machine.name} is not #{@state.mocha_inspect}"
       end
-
     end
 
     # @private
@@ -88,9 +84,11 @@ module Mocha
     end
 
     # Provides a mechanism to determine whether the {StateMachine} is not in the state specified by +state_name+ at some point in the future.
+    # rubocop:disable Naming/PredicateName
     def is_not(state_name)
       StatePredicate.new(self, state_name)
     end
+    # rubocop:enable Naming/PredicateName
 
     # @private
     def mocha_inspect
@@ -100,7 +98,5 @@ module Mocha
         "#{@name} has no current state"
       end
     end
-
   end
-
 end

data/lib/mocha/stubbing_error.rb

@@ -1,19 +1,8 @@
-require 'mocha/backtrace_filter'
+require 'mocha/error_with_filtered_backtrace'
 
 module Mocha
-
   # Exception raised when stubbing a particular method is not allowed.
   #
   # @see Configuration.prevent
-  class StubbingError < StandardError
-
-    # @private
-    def initialize(message = nil, backtrace = [])
-      super(message)
-      filter = BacktraceFilter.new
-      set_backtrace(filter.filtered(backtrace))
-    end
-
-  end
-
+  class StubbingError < ErrorWithFilteredBacktrace; end
 end

data/lib/mocha/test_unit.rb

@@ -1,3 +1,3 @@
-require "mocha/integration/test_unit"
+require 'mocha/integration/test_unit'
 
 Mocha::Integration::TestUnit.activate

data/lib/mocha/thrower.rb

@@ -1,15 +1,12 @@
 module Mocha
-
   class Thrower
-
     def initialize(tag, object = nil)
-      @tag, @object = tag, object
+      @tag = tag
+      @object = object
     end
 
     def evaluate
       throw @tag, @object
     end
-
   end
-
 end

data/lib/mocha/unexpected_invocation.rb

@@ -1,11 +1,11 @@
 module Mocha
-
   # Exception raised when an unexpected method is invoked
   class UnexpectedInvocation
-
     # @private
     def initialize(mock, symbol, *arguments)
-      @mock, @symbol, @arguments = mock, symbol, arguments
+      @mock = mock
+      @symbol = symbol
+      @arguments = arguments
     end
 
     # @private
@@ -20,7 +20,5 @@ module Mocha
     def short_description
       "unexpected invocation: #{@symbol}(#{@arguments.join(', ')})"
     end
-
   end
-
 end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "1.4.0"
+  VERSION = '1.7.0'.freeze
 end

data/lib/mocha/yield_parameters.rb

@@ -3,18 +3,16 @@ require 'mocha/single_yield'
 require 'mocha/multiple_yields'
 
 module Mocha
-
   class YieldParameters
-
     def initialize
       @parameter_groups = []
     end
 
     def next_invocation
       case @parameter_groups.length
-        when 0 then NoYields.new
-        when 1 then @parameter_groups.first
-        else @parameter_groups.shift
+      when 0 then NoYields.new
+      when 1 then @parameter_groups.first
+      else @parameter_groups.shift
       end
     end
 
@@ -25,7 +23,5 @@ module Mocha
     def multiple_add(*parameter_groups)
       @parameter_groups << MultipleYields.new(*parameter_groups)
     end
-
   end
-
 end

data/mocha.gemspec

@@ -1,76 +1,52 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-require "mocha/version"
+require 'mocha/version'
 
 Gem::Specification.new do |s|
-  s.name = "mocha"
+  s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
   s.required_ruby_version = '>= 1.8.7'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["James Mead"]
-  s.description = "Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes."
-  s.email = "mocha-developer@googlegroups.com"
+  s.authors = ['James Mead']
+  s.description = 'Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.'
+  s.email = 'mocha-developer@googlegroups.com'
 
   s.files = `git ls-files`.split("\n")
-  s.files.delete(".travis.yml")
-  s.files.delete(".gitignore")
+  s.files.delete('.travis.yml')
+  s.files.delete('.gitignore')
 
-  s.homepage = "http://gofreerange.com/mocha/docs"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "mocha"
-  s.summary = "Mocking and stubbing library"
-  s.has_rdoc = "yard"
+  s.homepage = 'http://gofreerange.com/mocha/docs'
+  s.require_paths = ['lib']
+  s.summary = 'Mocking and stubbing library'
+  s.has_rdoc = 'yard'
 
-  s.add_dependency("metaclass", "~> 0.0.1")
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency('metaclass', '~> 0.0.1')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      if RUBY_VERSION >= '1.9.3'
-        s.add_development_dependency("rake", ">= 0")
-      else
-        s.add_development_dependency("rake", "~> 10.0")
-      end
-      s.add_development_dependency("introspection", "~> 0.0.1")
-      if RUBY_VERSION >= '2.2.0'
-        s.add_development_dependency("minitest")
-      end
-      if ENV["MOCHA_GENERATE_DOCS"]
-        s.add_development_dependency("yard")
-        s.add_development_dependency("redcarpet")
-      end
-    else
-      if RUBY_VERSION >= '1.9.3'
-        s.add_development_dependency("rake", ">= 0")
-      else
-        s.add_development_dependency("rake", "~> 10.0")
-      end
-      s.add_dependency("introspection", "~> 0.0.1")
-      if RUBY_VERSION >= '2.2.0'
-        s.add_dependency("minitest")
-      end
-      if ENV["MOCHA_GENERATE_DOCS"]
-        s.add_dependency("yard")
-        s.add_dependency("redcarpet")
+  unless s.respond_to?(:add_development_dependency)
+    class << s
+      def add_development_dependency(*args)
+        add_dependency(*args)
       end
     end
+  end
+
+  if RUBY_VERSION >= '1.9.3'
+    s.add_development_dependency('rake')
   else
-    if RUBY_VERSION >= '1.9.3'
-      s.add_development_dependency("rake", ">= 0")
-    else
-      s.add_development_dependency("rake", "~> 10.0")
-    end
-    s.add_dependency("introspection", "~> 0.0.1")
-    if RUBY_VERSION >= '2.2.0'
-      s.add_dependency("minitest")
-    end
-    if ENV["MOCHA_GENERATE_DOCS"]
-      s.add_dependency("yard")
-      s.add_dependency("redcarpet")
-    end
+    # Rake >= v11 does not support Ruby < v1.9.3 so use
+    s.add_development_dependency('rake', '~> 10.0')
+  end
+  s.add_development_dependency('introspection', '~> 0.0.1')
+  if RUBY_VERSION >= '2.2.0'
+    # No test libraries in standard library
+    s.add_development_dependency('minitest')
+  end
+  if RUBY_VERSION >= '1.9.2'
+    s.add_development_dependency('rubocop')
+  end
+  if ENV['MOCHA_GENERATE_DOCS']
+    s.add_development_dependency('redcarpet')
+    s.add_development_dependency('yard')
   end
 end