mocha 1.6.0 → 1.7.0

data/lib/mocha/argument_iterator.rb

@@ -1,21 +1,17 @@
 module Mocha
-
   class ArgumentIterator
-
     def initialize(argument)
       @argument = argument
     end
 
-    def each(&block)
-      if @argument.is_a?(Hash) then
+    def each
+      if @argument.is_a?(Hash)
         @argument.each do |method_name, return_value|
-          block.call(method_name, return_value)
+          yield method_name, return_value
         end
       else
-        block.call(@argument)
+        yield @argument
       end
     end
-
   end
-
 end

data/lib/mocha/backtrace_filter.rb

@@ -1,8 +1,6 @@
 module Mocha
-
   class BacktraceFilter
-
-    LIB_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), "..")) + File::SEPARATOR
+    LIB_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), '..')) + File::SEPARATOR
 
     def initialize(lib_directory = LIB_DIRECTORY)
       @path_pattern = Regexp.new(lib_directory)
@@ -11,7 +9,5 @@ module Mocha
     def filtered(backtrace)
       backtrace.reject { |location| @path_pattern.match(File.expand_path(location)) }
     end
-
   end
-
 end

data/lib/mocha/cardinality.rb

@@ -1,11 +1,8 @@
 module Mocha
-
   class Cardinality
-
     INFINITY = 1 / 0.0
 
     class << self
-
       def exactly(count)
         new(count, count)
       end
@@ -20,15 +17,15 @@ module Mocha
 
       def times(range_or_count)
         case range_or_count
-          when Range then new(range_or_count.first, range_or_count.last)
-          else new(range_or_count, range_or_count)
+        when Range then new(range_or_count.first, range_or_count.last)
+        else new(range_or_count, range_or_count)
         end
       end
-
     end
 
     def initialize(required, maximum)
-      @required, @maximum = required, maximum
+      @required = required
+      @maximum = maximum
     end
 
     def invocations_allowed?(invocation_count)
@@ -48,28 +45,26 @@ module Mocha
     end
 
     def allowed_any_number_of_times?
-      required == 0 && infinite?(maximum)
+      required.zero? && infinite?(maximum)
     end
 
     def used?(invocation_count)
-      (invocation_count > 0) || (maximum == 0)
+      (invocation_count > 0) || maximum.zero?
     end
 
     def mocha_inspect
       if allowed_any_number_of_times?
-        "allowed any number of times"
+        'allowed any number of times'
+      elsif required.zero? && maximum.zero?
+        'expected never'
+      elsif required == maximum
+        "expected exactly #{times(required)}"
+      elsif infinite?(maximum)
+        "expected at least #{times(required)}"
+      elsif required.zero?
+        "expected at most #{times(maximum)}"
       else
-        if required == 0 && maximum == 0
-          "expected never"
-        elsif required == maximum
-          "expected exactly #{times(required)}"
-        elsif infinite?(maximum)
-          "expected at least #{times(required)}"
-        elsif required == 0
-          "expected at most #{times(maximum)}"
-        else
-          "expected between #{required} and #{times(maximum)}"
-        end
+        "expected between #{required} and #{times(maximum)}"
       end
     end
 
@@ -79,17 +74,15 @@ module Mocha
 
     def times(number)
       case number
-        when 0 then "no times"
-        when 1 then "once"
-        when 2 then "twice"
-        else "#{number} times"
+      when 0 then 'no times'
+      when 1 then 'once'
+      when 2 then 'twice'
+      else "#{number} times"
       end
     end
 
     def infinite?(number)
       number.respond_to?(:infinite?) && number.infinite?
     end
-
   end
-
 end

data/lib/mocha/central.rb

@@ -1,9 +1,6 @@
 module Mocha
-
   class Central
-
     class Null < self
-
       def initialize(&block)
         super
         @raise_not_initialized_error = block
@@ -16,7 +13,6 @@ module Mocha
       def unstub(*)
         @raise_not_initialized_error.call
       end
-
     end
 
     attr_accessor :stubba_methods
@@ -26,25 +22,21 @@ module Mocha
     end
 
     def stub(method)
-      unless stubba_methods.detect { |m| m.matches?(method) }
-        method.stub
-        stubba_methods.push(method)
-      end
+      return if stubba_methods.detect { |m| m.matches?(method) }
+      method.stub
+      stubba_methods.push(method)
     end
 
     def unstub(method)
-      if existing = stubba_methods.detect { |m| m.matches?(method) }
-        existing.unstub
-        stubba_methods.delete(existing)
-      end
+      return unless (existing = stubba_methods.detect { |m| m.matches?(method) })
+      existing.unstub
+      stubba_methods.delete(existing)
     end
 
     def unstub_all
-      while stubba_methods.any? do
+      while stubba_methods.any?
         unstub(stubba_methods.first)
       end
     end
-
   end
-
 end

data/lib/mocha/change_state_side_effect.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class ChangeStateSideEffect
-
     def initialize(state)
       @state = state
     end
@@ -13,7 +11,5 @@ module Mocha
     def mocha_inspect
       "then #{@state.mocha_inspect}"
     end
-
   end
-
 end

data/lib/mocha/class_method.rb

@@ -2,16 +2,15 @@ require 'mocha/ruby_version'
 require 'metaclass'
 
 module Mocha
-
   class ClassMethod
-
     PrependedModule = Class.new(Module)
 
     attr_reader :stubbee, :method
 
     def initialize(stubbee, method)
       @stubbee = stubbee
-      @original_method, @original_visibility = nil, nil
+      @original_method = nil
+      @original_visibility = nil
       @method = PRE_RUBY_V19 ? method.to_s : method.to_sym
     end
 
@@ -24,9 +23,8 @@ module Mocha
       remove_new_method
       restore_original_method
       mock.unstub(method.to_sym)
-      unless mock.any_expectations?
-        reset_mocha
-      end
+      return if mock.any_expectations?
+      reset_mocha
     end
 
     def mock
@@ -38,21 +36,22 @@ module Mocha
     end
 
     def hide_original_method
-      if @original_visibility = method_visibility(method)
-        begin
-          if RUBY_V2_PLUS
-            @definition_target = PrependedModule.new
-            stubbee.__metaclass__.__send__ :prepend, @definition_target
-          else
-            @original_method = stubbee._method(method)
-            if @original_method && @original_method.owner == stubbee.__metaclass__
-              stubbee.__metaclass__.send(:remove_method, method)
-            end
+      return unless (@original_visibility = method_visibility(method))
+      begin
+        if RUBY_V2_PLUS
+          @definition_target = PrependedModule.new
+          stubbee.__metaclass__.__send__ :prepend, @definition_target
+        else
+          @original_method = stubbee._method(method)
+          if @original_method && @original_method.owner == stubbee.__metaclass__
+            stubbee.__metaclass__.send(:remove_method, method)
           end
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end
+      # rubocop:disable Lint/HandleExceptions
+      rescue NameError
+        # deal with nasties like ActiveRecord::Associations::AssociationProxy
       end
+      # rubocop:enable Lint/HandleExceptions
     end
 
     def define_new_method
@@ -61,9 +60,8 @@ module Mocha
           mocha.method_missing(:#{method}, *args, &block)
         end
       CODE
-      if @original_visibility
-        Module.instance_method(@original_visibility).bind(definition_target).call(method)
-      end
+      return unless @original_visibility
+      Module.instance_method(@original_visibility).bind(definition_target).call(method)
     end
 
     def remove_new_method
@@ -71,26 +69,24 @@ module Mocha
     end
 
     def restore_original_method
-      unless RUBY_V2_PLUS
-        if @original_method && @original_method.owner == stubbee.__metaclass__
-          if PRE_RUBY_V19
-            original_method = @original_method
-            stubbee.__metaclass__.send(:define_method, method) do |*args, &block|
-              original_method.call(*args, &block)
-            end
-          else
-            stubbee.__metaclass__.send(:define_method, method, @original_method)
+      return if RUBY_V2_PLUS
+      if @original_method && @original_method.owner == stubbee.__metaclass__
+        if PRE_RUBY_V19
+          original_method = @original_method
+          stubbee.__metaclass__.send(:define_method, method) do |*args, &block|
+            original_method.call(*args, &block)
           end
-        end
-        if @original_visibility
-          Module.instance_method(@original_visibility).bind(stubbee.__metaclass__).call(method)
+        else
+          stubbee.__metaclass__.send(:define_method, method, @original_method)
         end
       end
+      return unless @original_visibility
+      Module.instance_method(@original_visibility).bind(stubbee.__metaclass__).call(method)
     end
 
     def matches?(other)
-      return false unless (other.class == self.class)
-      (stubbee.object_id == other.stubbee.object_id) and (method == other.method)
+      return false unless other.class == self.class
+      (stubbee.object_id == other.stubbee.object_id) && (method == other.method)
     end
 
     alias_method :==, :eql?
@@ -113,7 +109,5 @@ module Mocha
     def definition_target
       @definition_target ||= stubbee.__metaclass__
     end
-
   end
-
 end

data/lib/mocha/class_methods.rb

@@ -3,10 +3,8 @@ require 'mocha/class_method'
 require 'mocha/any_instance_method'
 
 module Mocha
-
   # Methods added to all classes to allow mocking and stubbing on real (i.e. non-mock) objects.
   module ClassMethods
-
     # @private
     def stubba_method
       Mocha::ClassMethod
@@ -14,7 +12,6 @@ module Mocha
 
     # @private
     class AnyInstance
-
       def initialize(klass)
         @stubba_object = klass
       end
@@ -31,20 +28,17 @@ module Mocha
         Mocha::AnyInstanceMethod
       end
 
-      def stubba_object
-        @stubba_object
-      end
+      attr_reader :stubba_object
 
       def method_exists?(method, include_public_methods = true)
         if include_public_methods
-          return true if @stubba_object.public_instance_methods(include_superclass_methods = true).include?(method)
+          return true if @stubba_object.public_instance_methods(true).include?(method)
           return true if @stubba_object.allocate.respond_to?(method.to_sym)
         end
-        return true if @stubba_object.protected_instance_methods(include_superclass_methods = true).include?(method)
-        return true if @stubba_object.private_instance_methods(include_superclass_methods = true).include?(method)
-        return false
+        return true if @stubba_object.protected_instance_methods(true).include?(method)
+        return true if @stubba_object.private_instance_methods(true).include?(method)
+        false
       end
-
     end
 
     # @return [Mock] a mock object which will detect calls to any instance of this class.
@@ -62,7 +56,5 @@ module Mocha
       end
       @any_instance ||= AnyInstance.new(self)
     end
-
   end
-
 end

data/lib/mocha/configuration.rb

@@ -1,5 +1,4 @@
 module Mocha
-
   # This class allows you to determine what should happen under certain circumstances. In each scenario, Mocha can be configured to {.allow do nothing}, {.warn_when display a warning message}, or {.prevent raise an exception}. The relevant scenario is identified using one of the following symbols:
   #
   # * +:stubbing_method_unnecessarily+ This is useful for identifying unused stubs. Unused stubs are often accidentally introduced when code is {http://martinfowler.com/bliki/DefinitionOfRefactoring.html refactored}. Allowed by default.
@@ -67,17 +66,15 @@ module Mocha
   #     # => no exception raised
   #   end
   class Configuration
-
     DEFAULTS = {
       :stubbing_method_unnecessarily => :allow,
       :stubbing_method_on_non_mock_object => :allow,
       :stubbing_non_existent_method => :allow,
       :stubbing_non_public_method => :allow,
-      :stubbing_method_on_nil => :prevent,
-    }
+      :stubbing_method_on_nil => :prevent
+    }.freeze
 
     class << self
-
       # Allow the specified +action+.
       #
       # @param [Symbol] action one of +:stubbing_method_unnecessarily+, +:stubbing_method_on_non_mock_object+, +:stubbing_non_existent_method+, +:stubbing_non_public_method+, +:stubbing_method_on_nil+.
@@ -139,16 +136,13 @@ module Mocha
       end
 
       # @private
-      def temporarily_change_config(action, new_value, &block)
+      def temporarily_change_config(action, new_value)
         original_value = configuration[action]
         configuration[action] = new_value
         yield
       ensure
         configuration[action] = original_value
       end
-
     end
-
   end
-
 end

data/lib/mocha/debug.rb

@@ -1,11 +1,12 @@
 module Mocha
   module Debug
     OPTIONS = (ENV['MOCHA_OPTIONS'] || '').split(',').inject({}) do |hash, key|
-      hash[key] = true; hash
+      hash[key] = true
+      hash
     end.freeze
 
     def self.puts(message)
-      $stderr.puts(message) if OPTIONS['debug']
+      warn(message) if OPTIONS['debug']
     end
   end
 end

data/lib/mocha/deprecation.rb

@@ -1,27 +1,20 @@
 require 'mocha/backtrace_filter'
 
 module Mocha
-
   class Deprecation
-
     class << self
-
       attr_accessor :mode, :messages
 
       def warning(message)
         @messages << message
-        unless mode == :disabled
-          filter = BacktraceFilter.new
-          location = filter.filtered(caller)[0]
-          $stderr.puts "Mocha deprecation warning at #{location}: #{message}"
-        end
+        return if mode == :disabled
+        filter = BacktraceFilter.new
+        location = filter.filtered(caller)[0]
+        warn "Mocha deprecation warning at #{location}: #{message}"
       end
-
     end
 
     self.mode = :enabled
     self.messages = []
-
   end
-
 end