mocha 1.6.0 → 1.7.0

data/lib/mocha/mockery.rb

@@ -11,11 +11,8 @@ require 'mocha/not_initialized_error'
 require 'mocha/expectation_error_factory'
 
 module Mocha
-
   class Mockery
-
     class Null < self
-
       def add_mock(*)
         raise_not_initialized_error
       end
@@ -34,11 +31,9 @@ module Mocha
         message = 'Mocha methods cannot be used outside the context of a test'
         raise NotInitializedError.new(message, caller)
       end
-
     end
 
     class << self
-
       def instance
         instances.last || Null.new
       end
@@ -65,7 +60,6 @@ module Mocha
       def instances
         @instances ||= []
       end
-
     end
 
     def named_mock(name, &block)
@@ -91,18 +85,17 @@ module Mocha
     def verify(assertion_counter = nil)
       unless mocks.all? { |mock| mock.__verified__?(assertion_counter) }
         message = "not all expectations were satisfied\n#{mocha_inspect}"
-        if unsatisfied_expectations.empty?
-          backtrace = caller
-        else
-          backtrace = unsatisfied_expectations[0].backtrace
-        end
+        backtrace = if unsatisfied_expectations.empty?
+                      caller
+                    else
+                      unsatisfied_expectations[0].backtrace
+                    end
         raise ExpectationErrorFactory.build(message, backtrace)
       end
       expectations.each do |e|
         unless Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
-          unless e.used?
-            on_stubbing_method_unnecessarily(e)
-          end
+          next if e.used?
+          on_stubbing_method_unnecessarily(e)
         end
       end
     end
@@ -125,22 +118,22 @@ module Mocha
     end
 
     def mocha_inspect
-      message = ""
-      message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map { |e| e.mocha_inspect }.join("\n- ")}\n" unless unsatisfied_expectations.empty?
-      message << "satisfied expectations:\n- #{satisfied_expectations.map { |e| e.mocha_inspect }.join("\n- ")}\n" unless satisfied_expectations.empty?
-      message << "states:\n- #{state_machines.map { |sm| sm.mocha_inspect }.join("\n- ")}" unless state_machines.empty?
+      message = ''
+      message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" unless unsatisfied_expectations.empty?
+      message << "satisfied expectations:\n- #{satisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" unless satisfied_expectations.empty?
+      message << "states:\n- #{state_machines.map(&:mocha_inspect).join("\n- ")}" unless state_machines.empty?
       message
     end
 
     def on_stubbing(object, method)
       method = PRE_RUBY_V19 ? method.to_s : method.to_sym
       unless Mocha::Configuration.allow?(:stubbing_non_existent_method)
-        unless object.method_exists?(method, include_public_methods = true)
+        unless object.method_exists?(method, true)
           on_stubbing_non_existent_method(object, method)
         end
       end
       unless Mocha::Configuration.allow?(:stubbing_non_public_method)
-        if object.method_exists?(method, include_public_methods = false)
+        if object.method_exists?(method, false)
           on_stubbing_non_public_method(object, method)
         end
       end
@@ -149,54 +142,48 @@ module Mocha
           on_stubbing_method_on_nil(object, method)
         end
       end
-      unless Mocha::Configuration.allow?(:stubbing_method_on_non_mock_object)
-        on_stubbing_method_on_non_mock_object(object, method)
-      end
+      return if Mocha::Configuration.allow?(:stubbing_method_on_non_mock_object)
+      on_stubbing_method_on_non_mock_object(object, method)
     end
 
     def on_stubbing_non_existent_method(object, method)
       if Mocha::Configuration.prevent?(:stubbing_non_existent_method)
         raise StubbingError.new("stubbing non-existent method: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_non_existent_method)
-        logger.warn "stubbing non-existent method: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_non_existent_method)
+      logger.warn "stubbing non-existent method: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_non_public_method(object, method)
       if Mocha::Configuration.prevent?(:stubbing_non_public_method)
         raise StubbingError.new("stubbing non-public method: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_non_public_method)
-        logger.warn "stubbing non-public method: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_non_public_method)
+      logger.warn "stubbing non-public method: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_method_on_nil(object, method)
       if Mocha::Configuration.prevent?(:stubbing_method_on_nil)
         raise StubbingError.new("stubbing method on nil: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_method_on_nil)
-        logger.warn "stubbing method on nil: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_method_on_nil)
+      logger.warn "stubbing method on nil: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_method_on_non_mock_object(object, method)
       if Mocha::Configuration.prevent?(:stubbing_method_on_non_mock_object)
         raise StubbingError.new("stubbing method on non-mock object: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_method_on_non_mock_object)
-        logger.warn "stubbing method on non-mock object: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_method_on_non_mock_object)
+      logger.warn "stubbing method on non-mock object: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_method_unnecessarily(expectation)
       if Mocha::Configuration.prevent?(:stubbing_method_unnecessarily)
         raise StubbingError.new("stubbing method unnecessarily: #{expectation.method_signature}", expectation.backtrace)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
-        logger.warn "stubbing method unnecessarily: #{expectation.method_signature}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+      logger.warn "stubbing method unnecessarily: #{expectation.method_signature}"
     end
 
     attr_writer :logger
@@ -205,7 +192,6 @@ module Mocha
       @logger ||= Logger.new($stderr)
     end
 
-
     private
 
     def expectations
@@ -213,11 +199,11 @@ module Mocha
     end
 
     def unsatisfied_expectations
-      expectations.reject { |e| e.verified? }
+      expectations.reject(&:verified?)
     end
 
     def satisfied_expectations
-      expectations.select { |e| e.verified? }
+      expectations.select(&:verified?)
     end
 
     def add_mock(mock)
@@ -235,7 +221,5 @@ module Mocha
       @mocks = nil
       @state_machines = nil
     end
-
   end
-
 end

data/lib/mocha/module_method.rb

@@ -1,8 +1,6 @@
 require 'mocha/class_method'
 
 module Mocha
-
   class ModuleMethod < ClassMethod
   end
-
 end

data/lib/mocha/module_methods.rb

@@ -1,14 +1,10 @@
 require 'mocha/module_method'
 
 module Mocha
-
   # @private
   module ModuleMethods
-
     def stubba_method
       Mocha::ModuleMethod
     end
-
   end
-
 end

data/lib/mocha/multiple_yields.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class MultipleYields
-
     attr_reader :parameter_groups
 
     def initialize(*parameter_groups)
@@ -13,8 +11,5 @@ module Mocha
         yield(parameter_group)
       end
     end
-
   end
-
 end
-

data/lib/mocha/names.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class ImpersonatingName
-
     def initialize(object)
       @object = object
     end
@@ -9,11 +7,9 @@ module Mocha
     def mocha_inspect
       @object.mocha_inspect
     end
-
   end
 
   class ImpersonatingAnyInstanceName
-
     def initialize(klass)
       @klass = klass
     end
@@ -21,11 +17,9 @@ module Mocha
     def mocha_inspect
       "#<AnyInstance:#{@klass.mocha_inspect}>"
     end
-
   end
 
   class Name
-
     def initialize(name)
       @name = name
     end
@@ -33,11 +27,9 @@ module Mocha
     def mocha_inspect
       "#<Mock:#{@name}>"
     end
-
   end
 
   class DefaultName
-
     def initialize(mock)
       @mock = mock
     end
@@ -45,9 +37,7 @@ module Mocha
     def mocha_inspect
       address = @mock.__id__ * 2
       address += 0x100000000 if address < 0
-      "#<Mock:0x#{'%x' % address}>"
+      "#<Mock:0x#{format('%x', address)}>"
     end
-
   end
-
 end

data/lib/mocha/no_yields.rb

@@ -1,11 +1,5 @@
 module Mocha
-
   class NoYields
-
-    def each
-    end
-
+    def each; end
   end
-
 end
-

data/lib/mocha/not_initialized_error.rb

@@ -1,9 +1,7 @@
 require 'mocha/error_with_filtered_backtrace'
 
 module Mocha
-
   # Exception raised when Mocha has not been initialized, e.g. outside the
   # context of a test.
   class NotInitializedError < ErrorWithFilteredBacktrace; end
-
 end

data/lib/mocha/object_methods.rb

@@ -4,12 +4,10 @@ require 'mocha/argument_iterator'
 require 'mocha/expectation_error_factory'
 
 module Mocha
-
   # Methods added to all objects to allow mocking and stubbing on real (i.e. non-mock) objects.
   #
   # Both {#expects} and {#stubs} return an {Expectation} which can be further modified by methods on {Expectation}.
   module ObjectMethods
-
     # @private
     alias_method :_method, :method
 
@@ -75,14 +73,14 @@ module Mocha
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(expected_methods_vs_return_values)
-      iterator.each { |*args|
+      iterator.each do |*args|
         method_name = args.shift
         mockery.on_stubbing(self, method_name)
         method = stubba_method.new(stubba_object, method_name)
         mockery.stubba.stub(method)
         expectation = mocha.expects(method_name, caller)
-        expectation.returns(args.shift) if args.length > 0
-      }
+        expectation.returns(args.shift) unless args.empty?
+      end
       expectation
     end
 
@@ -121,14 +119,14 @@ module Mocha
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(stubbed_methods_vs_return_values)
-      iterator.each { |*args|
+      iterator.each do |*args|
         method_name = args.shift
         mockery.on_stubbing(self, method_name)
         method = stubba_method.new(stubba_object, method_name)
         mockery.stubba.stub(method)
         expectation = mocha.stubs(method_name, caller)
-        expectation.returns(args.shift) if args.length > 0
-      }
+        expectation.returns(args.shift) unless args.empty?
+      end
       expectation
     end
 
@@ -166,14 +164,12 @@ module Mocha
     # @private
     def method_exists?(method, include_public_methods = true)
       if include_public_methods
-        return true if public_methods(include_superclass_methods = true).include?(method)
+        return true if public_methods(true).include?(method)
         return true if respond_to?(method.to_sym)
       end
-      return true if protected_methods(include_superclass_methods = true).include?(method)
-      return true if private_methods(include_superclass_methods = true).include?(method)
-      return false
+      return true if protected_methods(true).include?(method)
+      return true if private_methods(true).include?(method)
+      false
     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/parameter_matchers/all_of.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches if all +matchers+ match.
     #
     # @param [*Array<Base>] parameter_matchers parameter matchers.
@@ -28,7 +26,6 @@ module Mocha
 
     # Parameter matcher which combines a number of other matchers using a logical AND.
     class AllOf < Base
-
       # @private
       def initialize(*matchers)
         @matchers = matchers
@@ -42,11 +39,8 @@ module Mocha
 
       # @private
       def mocha_inspect
-        "all_of(#{@matchers.map { |matcher| matcher.mocha_inspect }.join(", ") })"
+        "all_of(#{@matchers.map(&:mocha_inspect).join(', ')})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/any_of.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches if any +matchers+ match.
     #
     # @param [*Array<Base>] parameter_matchers parameter matchers.
@@ -34,7 +32,6 @@ module Mocha
 
     # Parameter matcher which combines a number of other matchers using a logical OR.
     class AnyOf < Base
-
       # @private
       def initialize(*matchers)
         @matchers = matchers
@@ -48,11 +45,8 @@ module Mocha
 
       # @private
       def mocha_inspect
-        "any_of(#{@matchers.map { |matcher| matcher.mocha_inspect }.join(", ") })"
+        "any_of(#{@matchers.map(&:mocha_inspect).join(', ')})"
       end
-
     end
-
   end
-
 end

data/lib/mocha/parameter_matchers/any_parameters.rb

@@ -1,9 +1,7 @@
 require 'mocha/parameter_matchers/base'
 
 module Mocha
-
   module ParameterMatchers
-
     # Matches any parameters. This is used as the default for a newly built expectation.
     #
     # @return [AnyParameters] parameter matcher.
@@ -26,22 +24,18 @@ module Mocha
 
     # Parameter matcher which always matches whatever the parameters.
     class AnyParameters < Base
-
       # @private
       def matches?(available_parameters)
-        while available_parameters.length > 0 do
+        until available_parameters.empty?
           available_parameters.shift
         end
-        return true
+        true
       end
 
       # @private
       def mocha_inspect
-        "any_parameters"
+        'any_parameters'
       end
-
     end
-
   end
-
 end