rspec-mocks 3.0.4 → 3.1.0

data/lib/rspec/mocks/space.rb

@@ -5,23 +5,23 @@ module RSpec
     # the scope of an example. Called "root" because it serves
     # as the root of the space stack.
     class RootSpace
-      def proxy_for(*args)
+      def proxy_for(*_args)
         raise_lifecycle_message
       end
 
-      def any_instance_recorder_for(*args)
+      def any_instance_recorder_for(*_args)
         raise_lifecycle_message
       end
 
-      def any_instance_proxy_for(*args)
+      def any_instance_proxy_for(*_args)
         raise_lifecycle_message
       end
 
-      def register_constant_mutator(mutator)
+      def register_constant_mutator(_mutator)
         raise_lifecycle_message
       end
 
-      def any_instance_recorders_from_ancestry_of(object)
+      def any_instance_recorders_from_ancestry_of(_object)
         raise_lifecycle_message
       end
 
@@ -31,7 +31,7 @@ module RSpec
       def verify_all
       end
 
-      def registered?(object)
+      def registered?(_object)
         false
       end
 
@@ -43,7 +43,7 @@ module RSpec
 
       def raise_lifecycle_message
         raise OutsideOfExampleError,
-          "The use of doubles or partial doubles from rspec-mocks outside of the per-test lifecycle is not supported."
+              "The use of doubles or partial doubles from rspec-mocks outside of the per-test lifecycle is not supported."
       end
     end
 
@@ -84,7 +84,7 @@ module RSpec
         @constant_mutators.find { |m| m.full_constant_name == name }
       end
 
-      def any_instance_recorder_for(klass, only_return_existing = false)
+      def any_instance_recorder_for(klass, only_return_existing=false)
         any_instance_mutex.synchronize do
           id = klass.__id__
           any_instance_recorders.fetch(id) do
@@ -112,7 +112,7 @@ module RSpec
       alias ensure_registered proxy_for
 
       def registered?(object)
-        proxies.has_key?(id_for object)
+        proxies.key?(id_for object)
       end
 
       def any_instance_recorders_from_ancestry_of(object)
@@ -147,21 +147,21 @@ module RSpec
 
       def proxy_not_found_for(id, object)
         proxies[id] = case object
-          when NilClass   then ProxyForNil.new(@expectation_ordering)
-          when TestDouble then object.__build_mock_proxy_unless_expired(@expectation_ordering)
-          when Class
-            if RSpec::Mocks.configuration.verify_partial_doubles?
-              VerifyingPartialClassDoubleProxy.new(self, object, @expectation_ordering)
-            else
-              PartialClassDoubleProxy.new(self, object, @expectation_ordering)
-            end
-          else
-            if RSpec::Mocks.configuration.verify_partial_doubles?
-              VerifyingPartialDoubleProxy.new(object, @expectation_ordering)
-            else
-              PartialDoubleProxy.new(object, @expectation_ordering)
-            end
-        end
+                      when NilClass   then ProxyForNil.new(@expectation_ordering)
+                      when TestDouble then object.__build_mock_proxy_unless_expired(@expectation_ordering)
+                      when Class
+                        if RSpec::Mocks.configuration.verify_partial_doubles?
+                          VerifyingPartialClassDoubleProxy.new(self, object, @expectation_ordering)
+                        else
+                          PartialClassDoubleProxy.new(self, object, @expectation_ordering)
+                        end
+                      else
+                        if RSpec::Mocks.configuration.verify_partial_doubles?
+                          VerifyingPartialDoubleProxy.new(object, @expectation_ordering)
+                        else
+                          PartialDoubleProxy.new(object, @expectation_ordering)
+                        end
+                      end
       end
 
       def any_instance_recorder_not_found_for(id, klass)

data/lib/rspec/mocks/syntax.rb

@@ -10,7 +10,7 @@ module RSpec
       end
 
       # @private
-      def self.warn_unless_should_configured(method_name ,replacement = "the new `:expect` syntax or explicitly enable `:should`")
+      def self.warn_unless_should_configured(method_name , replacement="the new `:expect` syntax or explicitly enable `:should`")
         if @warn_about_should
           RSpec.deprecate(
             "Using `#{method_name}` from rspec-mocks' old `:should` syntax without explicitly enabling the syntax",
@@ -23,7 +23,7 @@ module RSpec
 
       # @api private
       # Enables the should syntax (`dbl.stub`, `dbl.should_receive`, etc).
-      def self.enable_should(syntax_host = default_should_syntax_host)
+      def self.enable_should(syntax_host=default_should_syntax_host)
         @warn_about_should = false if syntax_host == default_should_syntax_host
         return if should_enabled?(syntax_host)
 
@@ -41,7 +41,7 @@ module RSpec
           def stub(message_or_hash, opts={}, &block)
             ::RSpec::Mocks::Syntax.warn_unless_should_configured(__method__)
             if ::Hash === message_or_hash
-              message_or_hash.each {|message, value| stub(message).and_return value }
+              message_or_hash.each { |message, value| stub(message).and_return value }
             else
               ::RSpec::Mocks.allow_message(self, message_or_hash, opts, &block)
             end
@@ -86,7 +86,7 @@ module RSpec
 
       # @api private
       # Disables the should syntax (`dbl.stub`, `dbl.should_receive`, etc).
-      def self.disable_should(syntax_host = default_should_syntax_host)
+      def self.disable_should(syntax_host=default_should_syntax_host)
         return unless should_enabled?(syntax_host)
 
         syntax_host.class_exec do
@@ -107,7 +107,7 @@ module RSpec
 
       # @api private
       # Enables the expect syntax (`expect(dbl).to receive`, `allow(dbl).to receive`, etc).
-      def self.enable_expect(syntax_host = ::RSpec::Mocks::ExampleMethods)
+      def self.enable_expect(syntax_host=::RSpec::Mocks::ExampleMethods)
         return if expect_enabled?(syntax_host)
 
         syntax_host.class_exec do
@@ -147,7 +147,7 @@ module RSpec
 
       # @api private
       # Disables the expect syntax (`expect(dbl).to receive`, `allow(dbl).to receive`, etc).
-      def self.disable_expect(syntax_host = ::RSpec::Mocks::ExampleMethods)
+      def self.disable_expect(syntax_host=::RSpec::Mocks::ExampleMethods)
         return unless expect_enabled?(syntax_host)
 
         syntax_host.class_exec do
@@ -166,13 +166,13 @@ module RSpec
 
       # @api private
       # Indicates whether or not the should syntax is enabled.
-      def self.should_enabled?(syntax_host = default_should_syntax_host)
+      def self.should_enabled?(syntax_host=default_should_syntax_host)
         syntax_host.method_defined?(:should_receive)
       end
 
       # @api private
       # Indicates whether or not the expect syntax is enabled.
-      def self.expect_enabled?(syntax_host = ::RSpec::Mocks::ExampleMethods)
+      def self.expect_enabled?(syntax_host=::RSpec::Mocks::ExampleMethods)
         syntax_host.method_defined?(:allow)
       end
 

data/lib/rspec/mocks/targets.rb

@@ -15,7 +15,7 @@ module RSpec
         end
       end
 
-      def self.delegate_not_to(matcher_method, options = {})
+      def self.delegate_not_to(matcher_method, options={})
         method_name = options.fetch(:from)
         define_method(method_name) do |matcher, &block|
           case matcher
@@ -30,7 +30,7 @@ module RSpec
       end
 
       def self.disallow_negation(method_name)
-        define_method(method_name) do |matcher, *args|
+        define_method(method_name) do |matcher, *_args|
           raise_negation_unsupported(method_name, matcher)
         end
       end
@@ -47,14 +47,14 @@ module RSpec
 
       def raise_unsupported_matcher(method_name, matcher)
         raise UnsupportedMatcherError,
-          "only the `receive` or `receive_messages` matchers are supported " +
-          "with `#{expression}(...).#{method_name}`, but you have provided: #{matcher}"
+              "only the `receive` or `receive_messages` matchers are supported " \
+              "with `#{expression}(...).#{method_name}`, but you have provided: #{matcher}"
       end
 
       def raise_negation_unsupported(method_name, matcher)
         raise NegationUnsupportedError,
-          "`#{expression}(...).#{method_name} #{matcher.name}` is not supported since it " +
-          "doesn't really make sense. What would it even mean?"
+              "`#{expression}(...).#{method_name} #{matcher.name}` is not supported since it " \
+              "doesn't really make sense. What would it even mean?"
       end
 
       def expression

data/lib/rspec/mocks/test_double.rb

@@ -39,12 +39,12 @@ module RSpec
 
       # @private
       def inspect
-        "#<#{self.class}:#{sprintf '0x%x', self.object_id} @name=#{@name.inspect}>"
+        "#<#{self.class}:#{'0x%x' % object_id} @name=#{@name.inspect}>"
       end
 
       # @private
       def to_s
-        inspect.gsub('<','[').gsub('>',']')
+        inspect.gsub('<', '[').gsub('>', ']')
       end
 
       # @private
@@ -54,7 +54,7 @@ module RSpec
 
       # @private
       def __build_mock_proxy_unless_expired(order_group)
-        __raise_expired_error or __build_mock_proxy(order_group)
+        __raise_expired_error || __build_mock_proxy(order_group)
       end
 
       # @private

data/lib/rspec/mocks/verifying_double.rb

@@ -3,7 +3,6 @@ require 'stringio'
 
 module RSpec
   module Mocks
-
     # @private
     module VerifyingDouble
       def respond_to?(message, include_private=false)
@@ -11,11 +10,11 @@ module RSpec
 
         method_ref = __mock_proxy.method_reference[message]
 
-        return case method_ref.visibility
-          when :public    then true
-          when :private   then include_private
-          when :protected then include_private || RUBY_VERSION.to_f < 2.0
-          else !method_ref.unimplemented?
+        case method_ref.visibility
+        when :public    then true
+        when :private   then include_private
+        when :protected then include_private || RUBY_VERSION.to_f < 2.0
+        else !method_ref.unimplemented?
         end
       end
 
@@ -74,8 +73,8 @@ module RSpec
 
       def __build_mock_proxy(order_group)
         VerifyingProxy.new(self, order_group, @name,
-          @doubled_module,
-          InstanceMethodReference
+                           @doubled_module,
+                           InstanceMethodReference
         )
       end
     end
@@ -88,7 +87,7 @@ module RSpec
       include TestDouble
       include VerifyingDouble
 
-      def as_stubbed_const(options = {})
+      def as_stubbed_const(options={})
         ConstantMutator.stub(@doubled_module.const_to_replace, self, options)
         self
       end
@@ -102,8 +101,8 @@ module RSpec
 
       def __build_mock_proxy(order_group)
         VerifyingProxy.new(self, order_group, @name,
-          @doubled_module,
-          ObjectMethodReference
+                           @doubled_module,
+                           ObjectMethodReference
         )
       end
     end
@@ -124,6 +123,5 @@ module RSpec
     class ClassVerifyingDouble < Module
       include ObjectVerifyingDoubleMethods
     end
-
   end
 end

data/lib/rspec/mocks/verifying_message_expecation.rb

@@ -2,13 +2,11 @@ RSpec::Support.require_rspec_support 'method_signature_verifier'
 
 module RSpec
   module Mocks
-
     # A message expectation that knows about the real implementation of the
     # message being expected, so that it can verify that any expectations
     # have the valid arguments.
     # @api private
     class VerifyingMessageExpectation < MessageExpectation
-
       # A level of indirection is used here rather than just passing in the
       # method itself, since method look up is expensive and we only want to
       # do it if actually needed.
@@ -27,26 +25,30 @@ module RSpec
       def with(*args, &block)
         unless ArgumentMatchers::AnyArgsMatcher === args.first
           expected_args = if ArgumentMatchers::NoArgsMatcher === args.first
-            []
-          elsif args.length > 0
-            args
-          else
-            # No arguments given, this will raise.
-            super
-          end
-
-          validate_arguments!(expected_args)
+                            []
+                          elsif args.length > 0
+                            args
+                          else
+                            # No arguments given, this will raise.
+                            super
+                          end
+
+          validate_expected_arguments!(expected_args)
         end
         super
       end
 
     private
 
-      def validate_arguments!(actual_args)
+      def validate_expected_arguments!(actual_args)
         return if method_reference.nil?
 
         method_reference.with_signature do |signature|
-          verifier = Support::MethodSignatureVerifier.new(signature, actual_args)
+          verifier = Support::LooseSignatureVerifier.new(
+            signature,
+            actual_args
+          )
+
           unless verifier.valid?
             # Fail fast is required, otherwise the message expecation will fail
             # as well ("expected method not called") and clobber this one.

data/lib/rspec/mocks/verifying_proxy.rb

@@ -3,7 +3,6 @@ RSpec::Support.require_rspec_mocks 'method_reference'
 
 module RSpec
   module Mocks
-
     # @private
     module VerifyingProxyMethods
       def add_stub(method_name, opts={}, &implementation)
@@ -22,21 +21,20 @@ module RSpec
       end
 
       def ensure_implemented(method_name)
-        if method_reference[method_name].unimplemented?
-          @error_generator.raise_unimplemented_error(
-            @doubled_module,
-            method_name
-          )
-        end
+        return unless method_reference[method_name].unimplemented?
+
+        @error_generator.raise_unimplemented_error(
+          @doubled_module,
+          method_name
+        )
       end
 
-      def ensure_publicly_implemented(method_name, object)
+      def ensure_publicly_implemented(method_name, _object)
         ensure_implemented(method_name)
         visibility = method_reference[method_name].visibility
 
-        unless visibility == :public
-          @error_generator.raise_non_public_error(method_name, visibility)
-        end
+        return if visibility == :public
+        @error_generator.raise_non_public_error(method_name, visibility)
       end
     end
 
@@ -132,10 +130,8 @@ module RSpec
 
       def validate_arguments!(actual_args)
         @method_reference.with_signature do |signature|
-          verifier = Support::MethodSignatureVerifier.new(signature, actual_args)
-          unless verifier.valid?
-            raise ArgumentError, verifier.error_message
-          end
+          verifier = Support::StrictSignatureVerifier.new(signature, actual_args)
+          raise ArgumentError, verifier.error_message unless verifier.valid?
         end
       end
     end

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.0.4'
+      STRING = '3.1.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Steven Baker
@@ -33,7 +33,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -41,14 +41,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.0.4
+summary: rspec-mocks-3.1.0
 test_files: []
 has_rdoc: