garner 0.5.0 → 0.5.1

data/spec/garner/mixins/rack_spec.rb

@@ -22,17 +22,17 @@ describe Garner::Mixins::Rack do
     end
 
     it 'returns a Garner::Cache::Identity' do
-      subject.call.should be_a(Garner::Cache::Identity)
+      expect(subject.call).to be_a(Garner::Cache::Identity)
     end
 
     it "sets the identity's ruby_binding to self" do
-      subject.call.ruby_context.should eq @mock_app
+      expect(subject.call.ruby_context).to eq @mock_app
     end
 
     it 'applies each of Garner.config.rack_context_key_strategies' do
       # Default :context_key_strategies
-      subject.call.key_hash[:caller].should_not be_nil
-      subject.call.key_hash[:request_params].should eq('foo' => 'bar')
+      expect(subject.call.key_hash[:caller]).not_to be_nil
+      expect(subject.call.key_hash[:request_params]).to eq('foo' => 'bar')
 
       # Custom :context_key_strategies
       Garner.configure do |config|
@@ -40,8 +40,8 @@ describe Garner::Mixins::Rack do
           Garner::Strategies::Context::Key::RequestGet
         ]
       end
-      subject.call.key_hash[:caller].should be_nil
-      subject.call.key_hash[:request_params].should eq('foo' => 'bar')
+      expect(subject.call.key_hash[:caller]).to be_nil
+      expect(subject.call.key_hash[:request_params]).to eq('foo' => 'bar')
     end
 
   end

data/spec/garner/strategies/binding/invalidation/binding_index_spec.rb

@@ -4,7 +4,7 @@ describe Garner::Strategies::Binding::Invalidation::BindingIndex do
 
   before(:each) do
     @mock = double('model')
-    @mock.stub(:touch)
+    allow(@mock).to receive(:touch)
   end
 
   subject { Garner::Strategies::Binding::Invalidation::BindingIndex }

data/spec/garner/strategies/binding/invalidation/touch_spec.rb

@@ -4,7 +4,7 @@ describe Garner::Strategies::Binding::Invalidation::Touch do
 
   before(:each) do
     @mock = double('model')
-    @mock.stub(:touch)
+    allow(@mock).to receive(:touch)
   end
 
   subject { Garner::Strategies::Binding::Invalidation::Touch }
@@ -12,12 +12,12 @@ describe Garner::Strategies::Binding::Invalidation::Touch do
   it_behaves_like 'Garner::Strategies::Binding::Invalidation strategy'
 
   it 'calls :touch on the object' do
-    @mock.should_receive(:touch)
+    expect(@mock).to receive(:touch)
     subject.apply(@mock)
   end
 
   it 'does not raise error if :touch is undefined' do
-    @mock.unstub(:touch)
+    allow(@mock).to receive(:touch)
     expect { subject.apply(@mock) }.to_not raise_error
   end
 end

data/spec/garner/strategies/binding/key/binding_index_spec.rb

@@ -6,21 +6,21 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
     @new_mock = double('new_mock')
 
     @persisted_mock = double('persisted_mock')
-    @persisted_mock.stub(:identity_string) { 'Mocker/id=4' }
-    @persisted_mock.stub(:updated_at) { @time_dot_now }
+    allow(@persisted_mock).to receive(:identity_string) { 'Mocker/id=4' }
+    allow(@persisted_mock).to receive(:updated_at) { @time_dot_now }
 
     @persisted_mock_alias = double('persisted_mock_alias')
-    @persisted_mock_alias.stub(:identity_string) { 'MockerAlias/id=alias-4' }
-    @persisted_mock_alias.stub(:proxy_binding) { @persisted_mock }
+    allow(@persisted_mock_alias).to receive(:identity_string) { 'MockerAlias/id=alias-4' }
+    allow(@persisted_mock_alias).to receive(:proxy_binding) { @persisted_mock }
 
-    subject.stub(:canonical?) do |binding|
+    allow(subject).to receive(:canonical?) do |binding|
       binding == @persisted_mock
     end
 
     # Marshal.load will return a new mock object, breaking equivalence tests
     # when fetching from cache.
     load_method = Marshal.method(:load)
-    Marshal.stub(:load) do |dump|
+    allow(Marshal).to receive(:load) do |dump|
       default = load_method.call(dump)
       if default.is_a?(RSpec::Mocks::Double) &&
          default.instance_variable_get(:@name) == 'persisted_mock'
@@ -34,7 +34,7 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
     @mock_key = 'cc318d04bac07d5d91f06f8c'
     @mock_alias_key = 'f254b853d7b32406b5749410'
     @random_key = 'b1d44bb6b369903b28549271'
-    subject.stub(:new_cache_key_for) do |binding|
+    allow(subject).to receive(:new_cache_key_for) do |binding|
       if binding == @persisted_mock
         @mock_key
       elsif binding == @persisted_mock_alias
@@ -54,7 +54,7 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
 
   describe 'apply' do
     it 'calls fetch_cache_key_for' do
-      subject.should_receive(:fetch_cache_key_for).with(@persisted_mock)
+      expect(subject).to receive(:fetch_cache_key_for).with(@persisted_mock)
       subject.apply(@persisted_mock)
     end
   end
@@ -62,54 +62,54 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
   describe 'fetch_cache_key_for' do
     context 'with a canonical binding' do
       it 'returns a cache key string' do
-        subject.fetch_cache_key_for(@persisted_mock).should eq @mock_key
+        expect(subject.fetch_cache_key_for(@persisted_mock)).to eq @mock_key
       end
 
       it 'stores the cache key to cache' do
         subject.fetch_cache_key_for(@persisted_mock)
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: 'Mocker/id=4'
-                                 ).should eq @mock_key
+                                 )).to eq @mock_key
       end
     end
 
     context 'with a non-canonical binding' do
       it 'returns a cache key string' do
-        subject.fetch_cache_key_for(@persisted_mock_alias).should eq @mock_key
+        expect(subject.fetch_cache_key_for(@persisted_mock_alias)).to eq @mock_key
       end
 
       it 'stores the canonical binding to cache' do
         subject.fetch_cache_key_for(@persisted_mock_alias)
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: 'MockerAlias/id=alias-4'
-                                 ).should eq @persisted_mock
+                                 )).to eq @persisted_mock
       end
 
       it 'stores the cache key to cache' do
         subject.fetch_cache_key_for(@persisted_mock_alias)
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: 'Mocker/id=4'
-                                 ).should eq @mock_key
+                                 )).to eq @mock_key
       end
 
       context 'whose canonical binding is nil' do
         before(:each) do
-          @persisted_mock_alias.stub(:proxy_binding) { nil }
+          allow(@persisted_mock_alias).to receive(:proxy_binding) { nil }
         end
 
         it 'returns a nil cache key' do
-          subject.fetch_cache_key_for(@persisted_mock_alias).should be_nil
+          expect(subject.fetch_cache_key_for(@persisted_mock_alias)).to be_nil
         end
 
         it 'does not store the cache key to cache' do
           subject.fetch_cache_key_for(@persisted_mock_alias)
-          Garner.config.cache.read(
+          expect(Garner.config.cache.read(
                                      strategy: subject,
                                      proxied_binding: ''
-                                   ).should be_nil
+                                   )).to be_nil
         end
       end
     end
@@ -118,22 +118,22 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
   describe 'write_cache_key_for' do
     context 'with a canonical binding' do
       it 'returns a cache key string' do
-        subject.write_cache_key_for(@persisted_mock).should eq @mock_key
+        expect(subject.write_cache_key_for(@persisted_mock)).to eq @mock_key
       end
     end
 
     context 'with a non-canonical binding' do
       it 'returns a cache key string' do
-        subject.write_cache_key_for(@persisted_mock_alias).should eq @mock_key
+        expect(subject.write_cache_key_for(@persisted_mock_alias)).to eq @mock_key
       end
 
       context 'whose canonical binding is nil' do
         before(:each) do
-          @persisted_mock_alias.stub(:proxy_binding) { nil }
+          allow(@persisted_mock_alias).to receive(:proxy_binding) { nil }
         end
 
         it 'returns a nil cache key' do
-          subject.write_cache_key_for(@persisted_mock_alias).should be_nil
+          expect(subject.write_cache_key_for(@persisted_mock_alias)).to be_nil
         end
       end
     end
@@ -142,27 +142,27 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
   describe 'fetch_canonical_binding_for' do
     context 'with a canonical binding' do
       it 'returns the canonical binding' do
-        subject.fetch_canonical_binding_for(@persisted_mock).should eq @persisted_mock
+        expect(subject.fetch_canonical_binding_for(@persisted_mock)).to eq @persisted_mock
       end
     end
 
     context 'with a non-canonical binding' do
       it 'returns the canonical binding' do
-        subject.fetch_canonical_binding_for(@persisted_mock_alias).should eq @persisted_mock
+        expect(subject.fetch_canonical_binding_for(@persisted_mock_alias)).to eq @persisted_mock
       end
 
       it 'stores the canonical binding to cache' do
         subject.fetch_canonical_binding_for(@persisted_mock_alias)
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: 'MockerAlias/id=alias-4'
-                                 ).should eq @persisted_mock
+                                 )).to eq @persisted_mock
       end
     end
 
     context 'with a proxyless binding' do
       it 'returns nil' do
-        subject.fetch_canonical_binding_for(@new_mock).should.nil?
+        expect(subject.fetch_canonical_binding_for(@new_mock)).to be nil
       end
     end
   end
@@ -170,27 +170,27 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
   describe 'write_canonical_binding_for' do
     context 'with a canonical binding' do
       it 'returns the canonical binding' do
-        subject.write_canonical_binding_for(@persisted_mock).should eq @persisted_mock
+        expect(subject.write_canonical_binding_for(@persisted_mock)).to eq @persisted_mock
       end
     end
 
     context 'with a non-canonical binding' do
       it 'returns the canonical binding' do
-        subject.write_canonical_binding_for(@persisted_mock_alias).should eq @persisted_mock
+        expect(subject.write_canonical_binding_for(@persisted_mock_alias)).to eq @persisted_mock
       end
     end
 
     context 'with a proxyless binding' do
       it 'returns nil' do
-        subject.write_canonical_binding_for(@new_mock).should.nil?
+        expect(subject.write_canonical_binding_for(@new_mock)).to be nil
       end
     end
   end
 
   context 'with real objects' do
     before(:each) do
-      subject.unstub(:canonical?)
-      subject.unstub(:new_cache_key_for)
+      allow(subject).to receive(:canonical?).and_call_original
+      allow(subject).to receive(:new_cache_key_for).and_call_original
       Garner.configure do |config|
         config.mongoid_identity_fields = [:_id, :_slugs]
       end
@@ -212,33 +212,33 @@ describe Garner::Strategies::Binding::Key::BindingIndex do
     describe 'apply' do
       it 'retrieves the correct key' do
         key = subject.apply(Cheese.find('m1'))
-        subject.apply(Cheese.identify('m1')).should eq key
+        expect(subject.apply(Cheese.identify('m1'))).to eq key
       end
 
       it 'stores the appropriate values to cache' do
         key1 = subject.apply(Food.identify(@cheese.id))
         key2 = subject.apply(Cheese.identify('m1'))
-        key1.should eq key2
+        expect(key1).to eq key2
 
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: "Garner::Mixins::Mongoid::Identity/klass=Food,handle=#{@cheese.id}"
-                                 ).should eq @cheese
+                                 )).to eq @cheese
 
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: 'Garner::Mixins::Mongoid::Identity/klass=Cheese,handle=m1'
-                                 ).should eq @cheese
+                                 )).to eq @cheese
 
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: "Cheese/id=#{@cheese.id}"
-                                 ).should eq key1
+                                 )).to eq key1
 
-        Garner.config.cache.read(
+        expect(Garner.config.cache.read(
                                    strategy: subject,
                                    proxied_binding: "Food/id=#{@cheese.id}"
-                                 ).should be_nil
+                                 )).to be_nil
       end
     end
   end

data/spec/garner/strategies/binding/key/cache_key_spec.rb

@@ -4,7 +4,7 @@ describe Garner::Strategies::Binding::Key::CacheKey do
 
   before(:each) do
     @mock = double('model')
-    @mock.stub(:cache_key) { 'mocks/4' }
+    allow(@mock).to receive(:cache_key) { 'mocks/4' }
   end
 
   subject { Garner::Strategies::Binding::Key::CacheKey }
@@ -16,7 +16,7 @@ describe Garner::Strategies::Binding::Key::CacheKey do
 
   describe 'apply' do
     it "returns the object's cache key, or nil" do
-      subject.apply(@mock).should eq 'mocks/4'
+      expect(subject.apply(@mock)).to eq 'mocks/4'
     end
   end
 

data/spec/garner/strategies/binding/key/safe_cache_key_spec.rb

@@ -4,11 +4,11 @@ describe Garner::Strategies::Binding::Key::SafeCacheKey do
 
   before(:each) do
     @new_mock = double('model')
-    @new_mock.stub(:cache_key) { 'mocks/4' }
+    allow(@new_mock).to receive(:cache_key) { 'mocks/4' }
     @persisted_mock = double('model')
     @time_dot_now = Time.now
-    @persisted_mock.stub(:cache_key) { "mocks/4-#{@time_dot_now.utc.to_s(:number)}" }
-    @persisted_mock.stub(:updated_at) { @time_dot_now }
+    allow(@persisted_mock).to receive(:cache_key) { "mocks/4-#{@time_dot_now.utc.to_s(:number)}" }
+    allow(@persisted_mock).to receive(:updated_at) { @time_dot_now }
   end
 
   subject { Garner::Strategies::Binding::Key::SafeCacheKey }
@@ -21,21 +21,21 @@ describe Garner::Strategies::Binding::Key::SafeCacheKey do
   describe 'apply' do
     it "returns the object's cache key + milliseconds if defined" do
       timestamp = @time_dot_now.utc.to_s(:number)
-      subject.apply(@persisted_mock).should =~ /^mocks\/4-#{timestamp}.[0-9]{10}$/
+      expect(subject.apply(@persisted_mock)).to match(/^mocks\/4-#{timestamp}.[0-9]{10}$/)
     end
 
     it 'returns nil if :cache_key is undefined or nil' do
-      @persisted_mock.unstub(:cache_key)
-      subject.apply(@persisted_mock).should be_nil
-      @persisted_mock.stub(:cache_key) { nil }
-      subject.apply(@persisted_mock).should be_nil
+      allow(@persisted_mock).to receive(:cache_key)
+      expect(subject.apply(@persisted_mock)).to be_nil
+      allow(@persisted_mock).to receive(:cache_key) { nil }
+      expect(subject.apply(@persisted_mock)).to be_nil
     end
 
     it 'returns nil if :updated_at is undefined or nil' do
-      @persisted_mock.unstub(:updated_at)
-      subject.apply(@persisted_mock).should be_nil
-      @persisted_mock.stub(:updated_at) { nil }
-      subject.apply(@persisted_mock).should be_nil
+      allow(@persisted_mock).to receive(:updated_at)
+      expect(subject.apply(@persisted_mock)).to be_nil
+      allow(@persisted_mock).to receive(:updated_at) { nil }
+      expect(subject.apply(@persisted_mock)).to be_nil
     end
   end
 

data/spec/garner/strategies/context/key/caller_spec.rb

@@ -11,21 +11,21 @@ describe Garner::Strategies::Context::Key::Caller do
   it_behaves_like 'Garner::Strategies::Context::Key strategy'
 
   it 'ignores nil caller' do
-    @mock_context.stub(:caller) { nil }
+    allow(@mock_context).to receive(:caller) { nil }
     subject.apply(@cache_identity, @mock_context)
-    @cache_identity.key_hash[:caller].should be_nil
+    expect(@cache_identity.key_hash[:caller]).to be_nil
   end
 
   it 'ignores nil caller location' do
-    @mock_context.stub(:caller) { [nil] }
+    allow(@mock_context).to receive(:caller) { [nil] }
     subject.apply(@cache_identity, @mock_context)
-    @cache_identity.key_hash[:caller].should be_nil
+    expect(@cache_identity.key_hash[:caller]).to be_nil
   end
 
   it 'ignores blank caller location' do
-    @mock_context.stub(:caller) { [''] }
+    allow(@mock_context).to receive(:caller) { [''] }
     subject.apply(@cache_identity, @mock_context)
-    @cache_identity.key_hash[:caller].should be_nil
+    expect(@cache_identity.key_hash[:caller]).to be_nil
   end
 
   context 'with default Garner.config.caller_root' do
@@ -35,17 +35,17 @@ describe Garner::Strategies::Context::Key::Caller do
     end
 
     it 'sets default_root to the nearest ancestor with a Gemfile' do
-      subject.default_root.should eq @gemfile_root
+      expect(subject.default_root).to eq @gemfile_root
     end
 
     it 'sets Garner.config.caller_root to the nearest ancestor with a Gemfile' do
-      Garner.config.caller_root.should eq @gemfile_root
+      expect(Garner.config.caller_root).to eq @gemfile_root
     end
 
     it 'sets an appropriate value for :caller' do
       truncated = __FILE__.gsub(@gemfile_root + File::SEPARATOR, '')
       subject.apply(@cache_identity, self)
-      @cache_identity.key_hash[:caller].should eq "#{truncated}:#{__LINE__ - 1}"
+      expect(@cache_identity.key_hash[:caller]).to eq "#{truncated}:#{__LINE__ - 1}"
     end
   end
 
@@ -53,21 +53,21 @@ describe Garner::Strategies::Context::Key::Caller do
     before(:each) do
       class Rails
       end
-      Rails.stub(:root) { Pathname.new(File.dirname(__FILE__)) }
+      allow(Rails).to receive(:root) { Pathname.new(File.dirname(__FILE__)) }
     end
 
     it 'sets default_root to Rails.root' do
-      subject.default_root.should eq ::Rails.root.realpath.to_s
+      expect(subject.default_root).to eq ::Rails.root.realpath.to_s
     end
 
     it 'sets Garner.config.caller_root to Rails.root' do
-      Garner.config.caller_root.should eq ::Rails.root.realpath.to_s
+      expect(Garner.config.caller_root).to eq ::Rails.root.realpath.to_s
     end
 
     it 'sets an appropriate value for :caller' do
       truncated = File.basename(__FILE__)
       subject.apply(@cache_identity, self)
-      @cache_identity.key_hash[:caller].should eq "#{truncated}:#{__LINE__ - 1}"
+      expect(@cache_identity.key_hash[:caller]).to eq "#{truncated}:#{__LINE__ - 1}"
     end
   end
 
@@ -81,7 +81,7 @@ describe Garner::Strategies::Context::Key::Caller do
     it 'sets an appropriate value for :caller' do
       truncated = File.basename(__FILE__)
       subject.apply(@cache_identity, self)
-      @cache_identity.key_hash[:caller].should eq "#{truncated}:#{__LINE__ - 1}"
+      expect(@cache_identity.key_hash[:caller]).to eq "#{truncated}:#{__LINE__ - 1}"
     end
   end
 
@@ -94,13 +94,13 @@ describe Garner::Strategies::Context::Key::Caller do
 
     it 'sets an appropriate value for :caller' do
       subject.apply(@cache_identity, self)
-      @cache_identity.key_hash[:caller].should eq "#{__FILE__}:#{__LINE__ - 1}"
+      expect(@cache_identity.key_hash[:caller]).to eq "#{__FILE__}:#{__LINE__ - 1}"
     end
 
     it "doesn't require ActiveSupport" do
-      String.any_instance.stub(:blank?) { fail NoMethodError.new }
+      allow_any_instance_of(String).to receive(:blank?) { fail NoMethodError.new }
       subject.apply(@cache_identity, self)
-      @cache_identity.key_hash[:caller].should eq "#{__FILE__}:#{__LINE__ - 1}"
+      expect(@cache_identity.key_hash[:caller]).to eq "#{__FILE__}:#{__LINE__ - 1}"
     end
   end
 end