garner 0.5.0 → 0.5.1

data/spec/integration/sinatra_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'garner/mixins/rack'
 require 'sinatra'
 
-describe 'Sinatra integration' do
+describe 'Sinatra integration', type: :request do
 
   let(:app) do
     class TestSinatraApp < Sinatra::Base

data/spec/shared/binding_invalidation_strategy.rb

@@ -2,7 +2,7 @@
 # implement apply(binding) and force_apply(binding)
 shared_examples_for 'Garner::Strategies::Binding::Invalidation strategy' do
   it 'inherits from Garner::Strategies::Binding::Invalidation::Base' do
-    subject.new.should be_a(Garner::Strategies::Binding::Invalidation::Base)
+    expect(subject.new).to be_a(Garner::Strategies::Binding::Invalidation::Base)
   end
 
   describe 'apply' do

data/spec/shared/binding_key_strategy.rb

@@ -6,13 +6,13 @@ shared_examples_for 'Garner::Strategies::Binding::Key strategy' do
   end
 
   it 'inherits from Garner::Strategies::Binding::Key::Base' do
-    subject.new.should be_a(Garner::Strategies::Binding::Key::Base)
+    expect(subject.new).to be_a(Garner::Strategies::Binding::Key::Base)
   end
 
   describe 'given a known binding' do
     it 'returns a valid cache key' do
       known_bindings.each do |binding|
-        subject.apply(binding).should be_a(String)
+        expect(subject.apply(binding)).to be_a(String)
       end
     end
 
@@ -20,7 +20,7 @@ shared_examples_for 'Garner::Strategies::Binding::Key strategy' do
       known_bindings.each do |binding|
         key1 = subject.apply(binding)
         key2 = subject.apply(binding)
-        key1.should eq key2
+        expect(key1).to eq key2
       end
     end
   end
@@ -28,7 +28,7 @@ shared_examples_for 'Garner::Strategies::Binding::Key strategy' do
   describe 'given an unknown binding' do
     it 'returns a nil cache key' do
       unknown_bindings.each do |binding|
-        subject.apply(binding).should be_nil
+        expect(subject.apply(binding)).to be_nil
       end
     end
   end

data/spec/shared/conditional_get.rb

@@ -14,35 +14,35 @@ shared_examples_for 'Rack::ConditionalGet server' do
 
   it "writes the cached object's ETag from binding" do
     get '/'
-    last_response.headers['ETag'].length.should eq 32 + 2
+    expect(last_response.headers['ETag'].length).to eq 32 + 2
   end
 
   it 'sends a 304 response if content has not changed (If-None-Match)' do
     get '/'
-    last_response.status.should eq 200
-    last_response.headers['ETag'].should eq %Q("#{etag_for(last_response.body)}")
+    expect(last_response.status).to eq 200
+    expect(last_response.headers['ETag']).to eq %("#{etag_for(last_response.body)}")
     get '/', {},  'HTTP_IF_NONE_MATCH' => last_response.headers['ETag']
-    last_response.status.should eq 304
+    expect(last_response.status).to eq 304
   end
 
   it 'sends a 200 response if content has changed (If-None-Match)' do
     get '/'
-    last_response.status.should eq 200
-    get '/', {},  'HTTP_IF_NONE_MATCH' => %Q("#{etag_for('foobar')}")
-    last_response.status.should eq 200
+    expect(last_response.status).to eq 200
+    get '/', {},  'HTTP_IF_NONE_MATCH' => %("#{etag_for('foobar')}")
+    expect(last_response.status).to eq 200
   end
 
   it 'sends a 200 response if content has changed (valid If-Modified-Since but invalid If-None-Match)' do
     get '/'
-    last_response.status.should eq 200
-    get '/', {},  'HTTP_IF_MODIFIED_SINCE' => (Time.now + 1).httpdate, 'HTTP_IF_NONE_MATCH' => %Q("#{etag_for(last_response.body)}")
-    last_response.status.should eq 200
+    expect(last_response.status).to eq 200
+    get '/', {},  'HTTP_IF_MODIFIED_SINCE' => (Time.now + 1).httpdate, 'HTTP_IF_NONE_MATCH' => %("#{etag_for(last_response.body)}")
+    expect(last_response.status).to eq 200
   end
 
   it 'adds Cache-Control, Pragma and Expires headers' do
     get '/'
-    last_response.headers['Cache-Control'].split(', ').sort.should eq %w(max-age=0 must-revalidate private)
-    last_response.headers['Pragma'].should be_nil
-    Time.parse(last_response.headers['Expires']).should be < Time.now
+    expect(last_response.headers['Cache-Control'].split(', ').sort).to eq %w(max-age=0 must-revalidate private)
+    expect(last_response.headers['Pragma']).to be_nil
+    expect(Time.parse(last_response.headers['Expires'])).to be < Time.now
   end
 end

data/spec/shared/context_key_strategy.rb

@@ -6,7 +6,7 @@ shared_examples_for 'Garner::Strategies::Context::Key strategy' do
   end
 
   it 'inherits from Garner::Strategies::Context::Key::Base' do
-    subject.new.should be_a(Garner::Strategies::Context::Key::Base)
+    expect(subject.new).to be_a(Garner::Strategies::Context::Key::Base)
   end
 
   it 'requires a Garner::Cache::Identity' do
@@ -19,6 +19,6 @@ shared_examples_for 'Garner::Strategies::Context::Key strategy' do
 
   it 'returns a Garner::Cache::Identity' do
     modified_identity = subject.apply(@cache_identity, self)
-    modified_identity.should eq @cache_identity
+    expect(modified_identity).to eq @cache_identity
   end
 end

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ Dir["#{File.dirname(__FILE__)}/shared/*.rb"].each do |file|
 end
 
 RSpec.configure do |rspec|
+  rspec.raise_errors_for_deprecations!
   rspec.mock_with :rspec do |mocks|
     mocks.patch_marshal_to_support_partial_doubles = true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garner
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -255,14 +255,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.27.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.27.1
 description: 
 email:
 - dblock@dblock.org
@@ -279,6 +279,7 @@ files:
 - .gitignore
 - .rspec
 - .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -370,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Garner is a cache layer for Ruby and Rack applications, supporting model