refactor lookup for subclass

rspec · Aug 21, 2013 · a8b330b · a8b330b
1 parent abf019f
commit a8b330b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/lib/rspec/mocks/proxy.rb b/lib/rspec/mocks/proxy.rb
@@ -15,6 +15,9 @@ def initialize(object, name=nil, options={})
         @null_object = false
       end
 
+      # @private
+      attr_reader :object
+
       # @private
       def null_object?
         @null_object

diff --git a/lib/rspec/mocks/space.rb b/lib/rspec/mocks/space.rb
@@ -2,12 +2,11 @@ module RSpec
   module Mocks
     # @api private
     class Space
-      attr_reader :proxies, :any_instance_recorders, :proxies_by_klass
+      attr_reader :proxies, :any_instance_recorders
 
       def initialize
         @proxies                 = {}
         @any_instance_recorders  = {}
-        @proxies_by_klass = Hash.new { |hash, key| hash[key] = [] }
       end
 
       def verify_all
@@ -29,7 +28,6 @@ def reset_all
 
         proxies.clear
         any_instance_recorders.clear
-        proxies_by_klass.clear
         expectation_ordering.clear
       end
 
@@ -49,15 +47,7 @@ def remove_any_instance_recorder_for(klass)
       end
 
       def proxies_of(klass)
-        proxies_by_klass.inject([]) do |klass_proxies, (proxy_klass, object_ids)|
-          more_proxies =
-            if proxy_klass.ancestors.include?(klass) || klass.ancestors.include?(proxy_klass)
-              object_ids.map { |id| proxies[id] }
-            else
-              []
-            end
-          klass_proxies + more_proxies
-        end
+        proxies.values.select { |proxy| klass === proxy.object }
       end
 
       def proxy_for(object)
@@ -66,11 +56,7 @@ def proxy_for(object)
           proxies[id] = case object
                         when NilClass   then ProxyForNil.new
                         when TestDouble then object.__build_mock_proxy
-                        when Class then
-                          proxies_by_klass[object] << id
-                          PartialMockProxy.new(object)
                         else
-                          proxies_by_klass[object.class] << id
                           PartialMockProxy.new(object)
                         end
         end

diff --git a/spec/rspec/mocks/any_instance_spec.rb b/spec/rspec/mocks/any_instance_spec.rb
@@ -266,8 +266,6 @@ class RSpec::SampleRspecTestClass;end
       end
 
       context "unstub implementation" do
-        let(:sub_klass) { Class.new(klass) }
-
         it "replaces the stubbed method with the original method" do
           klass.any_instance.stub(:existing_method)
           klass.any_instance.unstub(:existing_method)
@@ -291,8 +289,8 @@ class RSpec::SampleRspecTestClass;end
 
         it "removes stubs from sub class after invokation when super class was originally stubbed" do
           klass.any_instance.stub(:existing_method).and_return(:any_instance_value)
-          obj = sub_klass.new
-          obj.existing_method
+          obj = Class.new(klass).new
+          expect(obj.existing_method).to eq(:any_instance_value)
           klass.any_instance.unstub(:existing_method)
           expect(obj.existing_method).to eq(:existing_method_return_value)
         end

diff --git a/spec/rspec/mocks/space_spec.rb b/spec/rspec/mocks/space_spec.rb
@@ -14,12 +14,7 @@ module RSpec::Mocks
       end
 
       it 'returns the proxies for objects of the same type as klass' do
-        expect(space.proxies_of(Object).size).to eq 4
-        expect(space.proxies_of(Object)).to be_all { |obj| obj.is_a? RSpec::Mocks::PartialMockProxy }
-      end
-
-      it 'returns the proxies of super classes of klass' do
-        expect(space.proxies_of(String).size).to eq 3
+        expect(space.proxies_of(String).size).to eq 1
         expect(space.proxies_of(String)).to be_all { |obj| obj.is_a? RSpec::Mocks::PartialMockProxy }
       end
     end