rspec-mocks 3.2.1 → 3.3.0

data/lib/rspec/mocks/test_double.rb

@@ -39,7 +39,7 @@ module RSpec
 
       # @private
       def inspect
-        "#<#{self.class}:#{'0x%x' % object_id} @name=#{@name.inspect}>"
+        TestDoubleFormatter.format(self)
       end
 
       # @private
@@ -91,14 +91,14 @@ module RSpec
         # https://github.com/jruby/jruby/issues/1398
         visibility = proxy.visibility_for(message)
         if visibility == :private || visibility == :protected
-          ErrorGenerator.new(self, @name).raise_non_public_error(
+          ErrorGenerator.new(self).raise_non_public_error(
             message, visibility
           )
         end
 
         # Required wrapping doubles in an Array on Ruby 1.9.2
         raise NoMethodError if [:to_a, :to_ary].include? message
-        proxy.raise_unexpected_message_error(message, *args)
+        proxy.raise_unexpected_message_error(message, args)
       end
 
       def assign_stubs(stubs)
@@ -112,12 +112,12 @@ module RSpec
       end
 
       def __build_mock_proxy(order_group)
-        TestDoubleProxy.new(self, order_group, @name)
+        TestDoubleProxy.new(self, order_group)
       end
 
       def __raise_expired_error
         return false unless @__expired
-        ErrorGenerator.new(self, @name).raise_expired_test_double_error
+        ErrorGenerator.new(self).raise_expired_test_double_error
       end
 
       def initialize_copy(other)
@@ -131,5 +131,40 @@ module RSpec
     class Double
       include TestDouble
     end
+
+    # @private
+    module TestDoubleFormatter
+      def self.format(dbl, unwrap=false)
+        format = "#{type_desc(dbl)}#{verified_module_desc(dbl)} #{name_desc(dbl)}"
+        return format if unwrap
+        "#<#{format}>"
+      end
+
+      class << self
+      private
+
+        def type_desc(dbl)
+          case dbl
+          when InstanceVerifyingDouble then "InstanceDouble"
+          when ClassVerifyingDouble    then "ClassDouble"
+          when ObjectVerifyingDouble   then "ObjectDouble"
+          else "Double"
+          end
+        end
+
+        # @private
+        IVAR_GET = Object.instance_method(:instance_variable_get)
+
+        def verified_module_desc(dbl)
+          return nil unless VerifyingDouble === dbl
+          "(#{IVAR_GET.bind(dbl).call(:@doubled_module).description})"
+        end
+
+        def name_desc(dbl)
+          return "(anonymous)" unless (name = IVAR_GET.bind(dbl).call(:@name))
+          name.inspect
+        end
+      end
+    end
   end
 end

data/lib/rspec/mocks/verifying_double.rb

@@ -1,5 +1,4 @@
 RSpec::Support.require_rspec_mocks 'verifying_proxy'
-require 'stringio'
 
 module RSpec
   module Mocks
@@ -35,8 +34,16 @@ module RSpec
         super
       end
 
+      # @private
+      module SilentIO
+        def self.method_missing(*); end
+        def self.respond_to?(*)
+          true
+        end
+      end
+
       # Redefining `__send__` causes ruby to issue a warning.
-      old, $stderr = $stderr, StringIO.new
+      old, $stderr = $stderr, SilentIO
       def __send__(name, *args, &block)
         @__sending_message = name
         super
@@ -55,8 +62,6 @@ module RSpec
         possible_name = args.first
         name = if String === possible_name || Symbol === possible_name
                  args.shift
-               else
-                 @description
                end
 
         super(name, *args)
@@ -73,13 +78,8 @@ module RSpec
       include TestDouble
       include VerifyingDouble
 
-      def initialize(doubled_module, *args)
-        @description = "#{doubled_module.description} (instance)"
-        super
-      end
-
       def __build_mock_proxy(order_group)
-        VerifyingProxy.new(self, order_group, @name,
+        VerifyingProxy.new(self, order_group,
                            @doubled_module,
                            InstanceMethodReference
         )
@@ -101,13 +101,8 @@ module RSpec
 
     private
 
-      def initialize(doubled_module, *args)
-        @description = doubled_module.description
-        super
-      end
-
       def __build_mock_proxy(order_group)
-        VerifyingProxy.new(self, order_group, @name,
+        VerifyingProxy.new(self, order_group,
                            @doubled_module,
                            ObjectMethodReference
         )

data/lib/rspec/mocks/verifying_proxy.rb

@@ -25,7 +25,8 @@ module RSpec
 
         @error_generator.raise_unimplemented_error(
           @doubled_module,
-          method_name
+          method_name,
+          @object
         )
       end
 
@@ -55,8 +56,8 @@ module RSpec
     class VerifyingProxy < TestDoubleProxy
       include VerifyingProxyMethods
 
-      def initialize(object, order_group, name, doubled_module, method_reference_class)
-        super(object, order_group, name)
+      def initialize(object, order_group, doubled_module, method_reference_class)
+        super(object, order_group)
         @object                 = object
         @doubled_module         = doubled_module
         @method_reference_class = method_reference_class
@@ -71,7 +72,7 @@ module RSpec
 
       def method_reference
         @method_reference ||= Hash.new do |h, k|
-          h[k] = @method_reference_class.new(@doubled_module, k)
+          h[k] = @method_reference_class.for(@doubled_module, k)
         end
       end
 
@@ -95,7 +96,11 @@ module RSpec
         # A custom method double is required to pass through a way to lookup
         # methods to determine their parameters.
         @method_doubles = Hash.new do |h, k|
-          h[k] = VerifyingExistingMethodDouble.new(object, k, self)
+          h[k] = VerifyingExistingMethodDouble.for(object, k, self)
+        end
+
+        RSpec::Mocks.configuration.verifying_double_callbacks.each do |block|
+          block.call @doubled_module
         end
       end
 
@@ -158,16 +163,35 @@ module RSpec
 
         # Trigger an eager find of the original method since if we find it any
         # later we end up getting a stubbed method with incorrect arity.
-        save_original_method!
+        save_original_implementation_callable!
       end
 
       def with_signature
-        yield Support::MethodSignature.new(original_method)
+        yield Support::MethodSignature.new(original_implementation_callable)
       end
 
       def unimplemented?
         !@valid_method
       end
+
+      def self.for(object, method_name, proxy)
+        if ClassNewMethodReference.applies_to?(method_name) { object }
+          VerifyingExistingClassNewMethodDouble
+        else
+          self
+        end.new(object, method_name, proxy)
+      end
+    end
+
+    # Used in place of a `VerifyingExistingMethodDouble` for the specific case
+    # of mocking or stubbing a `new` method on a class. In this case, we substitute
+    # the method signature from `#initialize` since new's signature is just `*args`.
+    #
+    # @private
+    class VerifyingExistingClassNewMethodDouble < VerifyingExistingMethodDouble
+      def with_signature
+        yield Support::MethodSignature.new(object.instance_method(:initialize))
+      end
     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.2.1'
+      STRING = '3.3.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
+- lib/rspec/mocks/any_instance/error_generator.rb
 - lib/rspec/mocks/any_instance/expect_chain_chain.rb
 - lib/rspec/mocks/any_instance/expectation_chain.rb
 - lib/rspec/mocks/any_instance/message_chains.rb
@@ -207,10 +208,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rspec
-rubygems_version: 2.4.5
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.2.1
+summary: rspec-mocks-3.3.0
 test_files: []
 has_rdoc: