rspec-mocks 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb4586d03e4b2bf84d904af032165dfae270599
-  data.tar.gz: 6889f7727cf4545a05618a19c0f7ff35174718ff
+  metadata.gz: 4da929a8edc5f89c1d58114f477ae88164702b0c
+  data.tar.gz: 227ea37af2920626b3b234ccbc2296c675727908
 SHA512:
-  metadata.gz: 5bb9e03448dfde3e78aec7388dd7b49bccb8005ec49a7ab525b41818a6678e41568fa7946a4d443a8103058d77c4ae2760ac07eb69b0ef37dd39f197e580aa48
-  data.tar.gz: 00a6e20fb91ccb3dd7212ac5877e9b348609aede07ed8158aee6032f1e30d7d89a833a7d1107343e780da15daa0800d94985cdd151796434f5413c8663935fa0
+  metadata.gz: a6300103d6164dcccd0f20a1840bf3d1e36c757be831e3490af21315c9b528d23f6b268f9db75025a3fd51d06fd41b4dfbbe1767cde1adfa180f952ee1467d65
+  data.tar.gz: 6d36f14ed060d44da89f6b589df55b341a0ff42c706670e5548d6c3991753baf2f334802879fdc90978359820a72ed6e7301d3ee555aab828187b0c8576265eb

data/Changelog.md

@@ -1,3 +1,13 @@
+### 3.3.1 / 2015-06-19
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.3.0...v3.3.1)
+
+Bug Fixes:
+
+* Fix bug in `before_verifying_double` callback logic that caused it to be called
+  once for each class in the ancestor list when mocking or stubbing a class. Now
+  it is only called for the mocked or stubbed class, as you would expect. (Sam
+  Phippen, #974)
+
 ### 3.3.0 / 2015-06-12
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.2.1...v3.3.0)
 
@@ -356,7 +366,7 @@ Bug Fixes:
   behavior. (Maurício Linhares)
 
 ### 3.0.0.beta1 / 2013-11-07
-[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.3...v3.0.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.4...v3.0.0.beta1)
 
 Breaking Changes for 3.0.0:
 
@@ -419,6 +429,13 @@ Bug Fixes:
   returns `nil` or `''` so that you still get a useful message.
   (Nick DeLuca)
 
+### 2.99.4 / 2015-06-19
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.3...v2.99.4)
+
+Bug Fixes:
+
+* Add missing deprecation for using `with` with no arguments e.g. `with()`. (Yousuke, #970)
+
 ### 2.99.3 / 2015-01-09
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.2...v2.99.3)
 

data/lib/rspec/mocks/proxy.rb

@@ -391,7 +391,7 @@ module RSpec
         return @superclass_proxy if defined?(@superclass_proxy)
 
         if (superclass = object.superclass)
-          @superclass_proxy = @source_space.proxy_for(superclass)
+          @superclass_proxy = @source_space.superclass_proxy_for(superclass)
         else
           @superclass_proxy = nil
         end

data/lib/rspec/mocks/space.rb

@@ -35,6 +35,10 @@ module RSpec
         false
       end
 
+      def superclass_proxy_for(*_args)
+        raise_lifecycle_message
+      end
+
       def new_scope
         Space.new
       end
@@ -109,6 +113,13 @@ module RSpec
         end
       end
 
+      def superclass_proxy_for(klass)
+        proxy_mutex.synchronize do
+          id = id_for(klass)
+          proxies.fetch(id) { superclass_proxy_not_found_for(id, klass) }
+        end
+      end
+
       alias ensure_registered proxy_for
 
       def registered?(object)
@@ -150,11 +161,7 @@ module RSpec
                       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
+                        class_proxy_with_callback_verification_strategy(object, CallbackInvocationStrategy.new)
                       else
                         if RSpec::Mocks.configuration.verify_partial_doubles?
                           VerifyingPartialDoubleProxy.new(object, @expectation_ordering)
@@ -164,6 +171,24 @@ module RSpec
                       end
       end
 
+      def superclass_proxy_not_found_for(id, object)
+        raise "superclass_proxy_not_found_for called with something that is not a class" unless Class === object
+        proxies[id] = class_proxy_with_callback_verification_strategy(object, NoCallbackInvocationStrategy.new)
+      end
+
+      def class_proxy_with_callback_verification_strategy(object, strategy)
+        if RSpec::Mocks.configuration.verify_partial_doubles?
+          VerifyingPartialClassDoubleProxy.new(
+            self,
+            object,
+            @expectation_ordering,
+            strategy
+          )
+        else
+          PartialClassDoubleProxy.new(self, object, @expectation_ordering)
+        end
+      end
+
       def any_instance_recorder_not_found_for(id, klass)
         any_instance_recorders[id] = AnyInstance::Recorder.new(klass)
       end

data/lib/rspec/mocks/verifying_proxy.rb

@@ -3,6 +3,21 @@ RSpec::Support.require_rspec_mocks 'method_reference'
 
 module RSpec
   module Mocks
+    # @private
+    class CallbackInvocationStrategy
+      def call(doubled_module)
+        RSpec::Mocks.configuration.verifying_double_callbacks.each do |block|
+          block.call doubled_module
+        end
+      end
+    end
+
+    # @private
+    class NoCallbackInvocationStrategy
+      def call(_doubled_module)
+      end
+    end
+
     # @private
     module VerifyingProxyMethods
       def add_stub(method_name, opts={}, &implementation)
@@ -85,11 +100,14 @@ module RSpec
       end
     end
 
+    # @private
+    DEFAULT_CALLBACK_INVOCATION_STRATEGY = CallbackInvocationStrategy.new
+
     # @private
     class VerifyingPartialDoubleProxy < PartialDoubleProxy
       include VerifyingProxyMethods
 
-      def initialize(object, expectation_ordering)
+      def initialize(object, expectation_ordering, optional_callback_invocation_strategy=DEFAULT_CALLBACK_INVOCATION_STRATEGY)
         super(object, expectation_ordering)
         @doubled_module = DirectObjectReference.new(object)
 
@@ -99,9 +117,7 @@ module RSpec
           h[k] = VerifyingExistingMethodDouble.for(object, k, self)
         end
 
-        RSpec::Mocks.configuration.verifying_double_callbacks.each do |block|
-          block.call @doubled_module
-        end
+        optional_callback_invocation_strategy.call(@doubled_module)
       end
 
       def method_reference

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.3.0'
+      STRING = '3.3.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -212,6 +212,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.3.0
+summary: rspec-mocks-3.3.1
 test_files: []
 has_rdoc: