rack-cache 1.0 → 1.0.1

data/CHANGES

@@ -1,3 +1,22 @@
+## 1.0.1 / April 2011
+
+  * Added lib/rack-cache.rb to match package name for auto-requiring machinery.
+
+  * Fixed a number of issues caused by Rack::Cache not closing the body received
+    from the application. Rack::Lock and other middleware use body.close to
+    signal the true end of request processing so failure to call this method
+    can result in strange issues (e.g.,
+    "ThreadError: deadlock; recursive locking")
+
+  * Fixed a bug where Rack::Cache would blow up writing the rack env to the meta
+    store when the env contained an all uppercase key whose value wasn't
+    marshalable. Passenger and some other stuff write such keys apparently.
+
+  * The test suite has moved from test-spec to bacon. This is a short term
+    solution to the problem of not being able to run tests under Ruby 1.9.x.
+    The test suite will be moved to basic Test::Unit style sometime in the
+    future.
+
 ## 1.0 / December 2010
 
   * Rack::Cache is 1.0 and will now maintain semantic versioning <http://semver.org/>

data/Rakefile

@@ -7,20 +7,21 @@ CLOBBER.include %w[dist]
 
 # SPECS =====================================================================
 
-desc 'Run specs with story style output'
-task :spec do
-  sh 'specrb --specdox -Ilib:test test/*_test.rb'
-end
-
 desc 'Run specs with unit test style output'
 task :test => FileList['test/*_test.rb'] do |t|
   suite = t.prerequisites
-  sh "specrb -Ilib:test #{suite.join(' ')}", :verbose => false
+  sh "bacon -q -I.:lib:test #{suite.join(' ')}", :verbose => false
+end
+
+desc 'Run specs with story style output'
+task :spec => FileList['test/*_test.rb'] do |t|
+  suite = t.prerequisites
+  sh "bacon -I.:lib:test #{suite.join(' ')}", :verbose => false
 end
 
 desc 'Generate test coverage report'
 task :rcov do
-  sh "rcov -Ilib:test test/*_test.rb"
+  sh "rcov -I.:lib:test test/*_test.rb"
 end
 
 # DOC =======================================================================

data/doc/index.markdown

@@ -12,8 +12,8 @@ for [Rack][]-based applications that produce freshness (`Expires`,
 News
 ----
 
-  * Rack::Cache 0.5 was released on May 25, 2009. See the
-    [`CHANGES`](http://github.com/rtomayko/rack-cache/blob/0.5.0/CHANGES) file
+  * Rack::Cache 1.0 was released on December 24, 2010. See the
+    [`CHANGES`](http://github.com/rtomayko/rack-cache/blob/1.0/CHANGES) file
     for details.
   * [How to use Rack::Cache with Rails 2.3](http://snippets.aktagon.com/snippets/302-How-to-setup-and-use-Rack-Cache-with-Rails-2-3-0-RC-1) - it's really easy.
   * [RailsLab's Advanced HTTP Caching Screencast](http://railslab.newrelic.com/2009/02/26/episode-11-advanced-http-caching)

data/doc/storage.markdown

@@ -141,11 +141,11 @@ The URI must specify the host and port of a remote memcached daemon. The path
 portion is an optional (but recommended) namespace that is prepended to each
 cache key.
 
-The memcached storage backend requires either the `memcache-client` or
-`memcached` libraries. By default, the `memcache-client` library is used;
-require the `memcached` library explicitly to use it instead.
+The memcached storage backend requires either the `dalli` or `memcached`
+libraries. By default, the `dalli` library is used; require the `memcached`
+library explicitly to use it instead.
 
-    gem install memcache-client
+    gem install dalli
 
 Memcached storage is reasonably fast and allows multiple backends to share a
 single cache. It is also the only storage implementation that allows the cache

data/lib/rack-cache.rb

@@ -0,0 +1 @@
+require 'rack/cache'

data/lib/rack/cache/context.rb

@@ -83,7 +83,10 @@ module Rack::Cache
 
       # tidy up response a bit
       response.not_modified! if not_modified?(response)
-      response.body = [] if @request.head?
+      if @request.head?
+        response.body.close if response.body.respond_to?(:close)
+        response.body = []
+      end
       response.to_a
     end
 
@@ -212,6 +215,11 @@ module Rack::Cache
           next unless value = response.headers[name]
           entry.headers[name] = value
         end
+
+        # even though it's empty, be sure to close the response body from upstream
+        # because middleware use close to signal end of response
+        response.body.close if response.body.respond_to?(:close)
+
         response = entry
       else
         record :invalid

data/lib/rack/cache/entitystore.rb

@@ -222,7 +222,9 @@ module Rack::Cache
       end
 
       def read(key)
-        cache.get(key)
+        data = cache.get(key)
+        data.force_encoding('BINARY') if data.respond_to?(:force_encoding)
+        data
       end
 
       def write(body)

data/lib/rack/cache/metastore.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'digest/sha1'
 require 'rack/utils'
+require 'rack/cache/key'
 
 module Rack::Cache
 
@@ -110,7 +111,7 @@ module Rack::Cache
     # returned must be marshalable.
     def persist_request(request)
       env = request.env.dup
-      env.reject! { |key,val| key =~ /[^0-9A-Z_]/ }
+      env.reject! { |key,val| key =~ /[^0-9A-Z_]/ || !val.respond_to?(:to_str) }
       env
     end
 

data/lib/rack/cache/response.rb

@@ -227,6 +227,7 @@ module Rack::Cache
     #
     # http://tools.ietf.org/html/rfc2616#section-10.3.5
     def not_modified!
+      body.close if body.respond_to?(:close)
       self.status = 304
       self.body = []
       NOT_MODIFIED_OMIT_HEADERS.each { |name| headers.delete(name) }

data/rack-cache.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'rack-cache'
-  s.version = '1.0'
-  s.date = '2010-12-24'
+  s.version = '1.0.1'
+  s.date = '2011-04-13'
 
   s.description = "HTTP Caching for Rack"
   s.summary     = "HTTP Caching for Rack"
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     doc/storage.markdown
     example/sinatra/app.rb
     example/sinatra/views/index.erb
+    lib/rack-cache.rb
     lib/rack/cache.rb
     lib/rack/cache/appengine.rb
     lib/rack/cache/cachecontrol.rb
@@ -61,7 +62,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README COPYING TODO CHANGES]
   s.add_dependency 'rack', '>= 0.4'
 
-  s.add_development_dependency 'test-spec'
+  s.add_development_dependency 'bacon'
   s.add_development_dependency 'memcached'
   s.add_development_dependency 'dalli'
 

data/test/cache_test.rb

@@ -25,7 +25,7 @@ describe 'Rack::Cache::new' do
   end
 
   it 'takes a block; executes it during initialization' do
-    state, object  = 'not invoked', nil
+    state, object = 'not invoked', nil
     instance =
       Rack::Cache.new @app do |cache|
         object = cache
@@ -33,6 +33,6 @@ describe 'Rack::Cache::new' do
         cache.should.respond_to :set
       end
     state.should.equal 'invoked'
-    object.should.be instance
+    object.should.be.same_as instance
   end
 end

data/test/cachecontrol_test.rb

@@ -11,7 +11,7 @@ describe 'Rack::Cache::CacheControl' do
   it 'takes a String and parses it into a Hash when created' do
     cache_control = Rack::Cache::CacheControl.new('max-age=600, foo')
     cache_control['max-age'].should.equal '600'
-    cache_control['foo'].should.be true
+    cache_control['foo'].should.be.true
   end
 
   it 'takes a String with a single name=value pair' do
@@ -29,17 +29,17 @@ describe 'Rack::Cache::CacheControl' do
   it 'takes a String with a single flag value' do
     cache_control = Rack::Cache::CacheControl.new('no-cache')
     cache_control.should.include 'no-cache'
-    cache_control['no-cache'].should.be true
+    cache_control['no-cache'].should.be.true
   end
 
   it 'takes a String with a bunch of all kinds of stuff' do
     cache_control =
       Rack::Cache::CacheControl.new('max-age=600,must-revalidate,min-fresh=3000,foo=bar,baz')
     cache_control['max-age'].should.equal '600'
-    cache_control['must-revalidate'].should.be true
+    cache_control['must-revalidate'].should.be.true
     cache_control['min-fresh'].should.equal '3000'
     cache_control['foo'].should.equal 'bar'
-    cache_control['baz'].should.be true
+    cache_control['baz'].should.be.true
   end
 
   it 'strips leading and trailing spaces from header value' do
@@ -80,7 +80,7 @@ describe 'Rack::Cache::CacheControl' do
 
   it 'responds to #max_age with nil when no max-age directive present' do
     cache_control = Rack::Cache::CacheControl.new('public')
-    cache_control.max_age.should.be nil
+    cache_control.max_age.should.be.nil
   end
 
   it 'responds to #shared_max_age with an integer when s-maxage directive present' do
@@ -90,7 +90,7 @@ describe 'Rack::Cache::CacheControl' do
 
   it 'responds to #shared_max_age with nil when no s-maxage directive present' do
     cache_control = Rack::Cache::CacheControl.new('public')
-    cache_control.shared_max_age.should.be nil
+    cache_control.shared_max_age.should.be.nil
   end
 
   it 'responds to #public? truthfully when public directive present' do

data/test/context_test.rb

@@ -2,8 +2,8 @@ require "#{File.dirname(__FILE__)}/spec_setup"
 require 'rack/cache/context'
 
 describe 'Rack::Cache::Context' do
-  before(:each) { setup_cache_context }
-  after(:each)  { teardown_cache_context }
+  before { setup_cache_context }
+  after  { teardown_cache_context }
 
   it 'passes on non-GET/HEAD requests' do
     respond_with 200
@@ -771,7 +771,7 @@ describe 'Rack::Cache::Context' do
   end
 
   describe 'with responses that include a Vary header' do
-    before(:each) do
+    before do
       count = 0
       respond_with 200 do |req,res|
         res['Vary'] = 'Accept User-Agent Foo'

data/test/entitystore_test.rb

@@ -8,8 +8,7 @@ class Object
   end
 end
 
-describe_shared 'A Rack::Cache::EntityStore Implementation' do
-
+shared 'A Rack::Cache::EntityStore Implementation' do
   it 'responds to all required messages' do
     %w[read open write exist?].each do |message|
       @store.should.respond_to message
@@ -86,8 +85,8 @@ end
 describe 'Rack::Cache::EntityStore' do
 
   describe 'Heap' do
-    it_should_behave_like 'A Rack::Cache::EntityStore Implementation'
     before { @store = Rack::Cache::EntityStore::Heap.new }
+    behaves_like 'A Rack::Cache::EntityStore Implementation'
     it 'takes a Hash to ::new' do
       @store = Rack::Cache::EntityStore::Heap.new('foo' => ['bar'])
       @store.read('foo').should.equal 'bar'
@@ -98,7 +97,6 @@ describe 'Rack::Cache::EntityStore' do
   end
 
   describe 'Disk' do
-    it_should_behave_like 'A Rack::Cache::EntityStore Implementation'
     before do
       @temp_dir = create_temp_directory
       @store = Rack::Cache::EntityStore::Disk.new(@temp_dir)
@@ -107,6 +105,8 @@ describe 'Rack::Cache::EntityStore' do
       @store = nil
       remove_entry_secure @temp_dir
     end
+    behaves_like 'A Rack::Cache::EntityStore Implementation'
+
     it 'takes a path to ::new and creates the directory' do
       path = @temp_dir + '/foo'
       @store = Rack::Cache::EntityStore::Disk.new(path)
@@ -177,20 +177,19 @@ describe 'Rack::Cache::EntityStore' do
 
   need_memcached 'entity store tests' do
     describe 'MemCached' do
-      it_should_behave_like 'A Rack::Cache::EntityStore Implementation'
       before do
         @store = Rack::Cache::EntityStore::MemCached.new($memcached)
       end
       after do
         @store = nil
       end
+      behaves_like 'A Rack::Cache::EntityStore Implementation'
     end
   end
 
 
   need_dalli 'entity store tests' do
     describe 'Dalli' do
-      it_should_behave_like 'A Rack::Cache::EntityStore Implementation'
       before do
         $dalli.flush_all
         @store = Rack::Cache::EntityStore::Dalli.new($dalli)
@@ -198,26 +197,25 @@ describe 'Rack::Cache::EntityStore' do
       after do
         @store = nil
       end
+      behaves_like 'A Rack::Cache::EntityStore Implementation'
     end
   end
-  
+
   need_java 'entity store testing' do
     module Rack::Cache::AppEngine
       module MC
         class << (Service = {})
- 
           def contains(key); include?(key); end
           def get(key); self[key]; end;
           def put(key, value, ttl = nil)
             self[key] = value
-          end  
+          end
         end
-        
+
       end
     end
-    
+
     describe 'GAEStore' do
-      it_should_behave_like 'A Rack::Cache::EntityStore Implementation'
       before do
         puts Rack::Cache::AppEngine::MC::Service.inspect
         @store = Rack::Cache::EntityStore::GAEStore.new
@@ -225,6 +223,7 @@ describe 'Rack::Cache::EntityStore' do
       after do
         @store = nil
       end
+      behaves_like 'A Rack::Cache::EntityStore Implementation'
     end
   end
 end

data/test/key_test.rb

@@ -2,6 +2,18 @@ require "#{File.dirname(__FILE__)}/spec_setup"
 require 'rack/cache/key'
 
 describe 'A Rack::Cache::Key' do
+  # Helper Methods =============================================================
+
+  def mock_request(*args)
+    uri, opts = args
+    env = Rack::MockRequest.env_for(uri, opts || {})
+    Rack::Cache::Request.new(env)
+  end
+
+  def new_key(request)
+    Rack::Cache::Key.call(request)
+  end
+
   it "sorts params" do
     request = mock_request('/test?z=last&a=first')
     new_key(request).should.include('a=first&z=last')
@@ -35,16 +47,4 @@ describe 'A Rack::Cache::Key' do
     request = mock_request('/test?x=y', "HTTP_HOST" => 'www2.example.org')
     new_key(request).should.equal "http://www2.example.org/test?x=y"
   end
-
-  # Helper Methods =============================================================
-
-  define_method :mock_request do |*args|
-    uri, opts = args
-    env = Rack::MockRequest.env_for(uri, opts || {})
-    Rack::Cache::Request.new(env)
-  end
-
-  define_method :new_key do |request|
-    Rack::Cache::Key.call(request)
-  end
 end

data/test/metastore_test.rb

@@ -1,11 +1,44 @@
 require "#{File.dirname(__FILE__)}/spec_setup"
 require 'rack/cache/metastore'
+require 'rack/cache/entitystore'
+
+shared 'A Rack::Cache::MetaStore Implementation' do
+
+  ###
+  # Helpers
+
+  def mock_request(uri, opts)
+    env = Rack::MockRequest.env_for(uri, opts || {})
+    Rack::Cache::Request.new(env)
+  end
+
+  def mock_response(status, headers, body)
+    headers ||= {}
+    body = Array(body).compact
+    Rack::Cache::Response.new(status, headers, body)
+  end
+
+  def slurp(body)
+    buf = ''
+    body.each { |part| buf << part }
+    buf
+  end
+
+  # Stores an entry for the given request args, returns a url encoded cache key
+  # for the request.
+  def store_simple_entry(*request_args)
+    path, headers = request_args
+    @request = mock_request(path || '/test', headers || {})
+    @response = mock_response(200, {'Cache-Control' => 'max-age=420'}, ['test'])
+    body = @response.body
+    cache_key = @store.store(@request, @response, @entity_store)
+    @response.body.should.not.be.same_as body
+    cache_key
+  end
 
-describe_shared 'A Rack::Cache::MetaStore Implementation' do
   before do
     @request = mock_request('/', {})
     @response = mock_response(200, {}, ['hello world'])
-    @entity_store = nil
   end
   after do
     @store = nil
@@ -43,7 +76,7 @@ describe_shared 'A Rack::Cache::MetaStore Implementation' do
 
   it 'returns nil from #purge' do
     @store.write('/test', [[{},{}]])
-    @store.purge('/test').should.be nil
+    @store.purge('/test').should.be.nil
     @store.read('/test').should.equal []
   end
 
@@ -75,20 +108,12 @@ describe_shared 'A Rack::Cache::MetaStore Implementation' do
     @store.cache_key(request).should == 'tset/'
   end
 
-  # Abstract methods ===========================================================
-
-  # Stores an entry for the given request args, returns a url encoded cache key
-  # for the request.
-  define_method :store_simple_entry do |*request_args|
-    path, headers = request_args
-    @request = mock_request(path || '/test', headers || {})
-    @response = mock_response(200, {'Cache-Control' => 'max-age=420'}, ['test'])
-    body = @response.body
-    cache_key = @store.store(@request, @response, @entity_store)
-    @response.body.should.not.be body
-    cache_key
+  it 'does not blow up when given a non-marhsalable object with an ALL_CAPS key' do
+    store_simple_entry('/bad', { 'SOME_THING' => Proc.new {} })
   end
 
+  # Abstract methods ===========================================================
+
   it 'stores a cache entry' do
     cache_key = store_simple_entry
     @store.read(cache_key).should.not.be.empty
@@ -206,39 +231,19 @@ describe_shared 'A Rack::Cache::MetaStore Implementation' do
 
     @store.read(key).length.should.equal 2
   end
-
-  # Helper Methods =============================================================
-
-  define_method :mock_request do |uri,opts|
-    env = Rack::MockRequest.env_for(uri, opts || {})
-    Rack::Cache::Request.new(env)
-  end
-
-  define_method :mock_response do |status,headers,body|
-    headers ||= {}
-    body = Array(body).compact
-    Rack::Cache::Response.new(status, headers, body)
-  end
-
-  define_method :slurp do |body|
-    buf = ''
-    body.each {|part| buf << part }
-    buf
-  end
 end
 
 
 describe 'Rack::Cache::MetaStore' do
   describe 'Heap' do
-    it_should_behave_like 'A Rack::Cache::MetaStore Implementation'
     before do
       @store = Rack::Cache::MetaStore::Heap.new
       @entity_store = Rack::Cache::EntityStore::Heap.new
     end
+    behaves_like 'A Rack::Cache::MetaStore Implementation'
   end
 
   describe 'Disk' do
-    it_should_behave_like 'A Rack::Cache::MetaStore Implementation'
     before do
       @temp_dir = create_temp_directory
       @store = Rack::Cache::MetaStore::Disk.new("#{@temp_dir}/meta")
@@ -247,29 +252,30 @@ describe 'Rack::Cache::MetaStore' do
     after do
       remove_entry_secure @temp_dir
     end
+    behaves_like 'A Rack::Cache::MetaStore Implementation'
   end
 
   need_memcached 'metastore tests' do
     describe 'MemCached' do
-      it_should_behave_like 'A Rack::Cache::MetaStore Implementation'
-      before :each do
+      before do
         @temp_dir = create_temp_directory
         $memcached.flush
         @store = Rack::Cache::MetaStore::MemCached.new($memcached)
         @entity_store = Rack::Cache::EntityStore::Heap.new
       end
+      behaves_like 'A Rack::Cache::MetaStore Implementation'
     end
   end
 
   need_dalli 'metastore tests' do
     describe 'Dalli' do
-      it_should_behave_like 'A Rack::Cache::MetaStore Implementation'
-      before :each do
+      before do
         @temp_dir = create_temp_directory
         $dalli.flush_all
         @store = Rack::Cache::MetaStore::Dalli.new($dalli)
         @entity_store = Rack::Cache::EntityStore::Heap.new
       end
+      behaves_like 'A Rack::Cache::MetaStore Implementation'
     end
   end
 
@@ -289,12 +295,12 @@ describe 'Rack::Cache::MetaStore' do
     end
 
     describe 'GAEStore' do
-      it_should_behave_like 'A Rack::Cache::MetaStore Implementation'
       before :each do
         Rack::Cache::AppEngine::MC::Service.clear
         @store = Rack::Cache::MetaStore::GAEStore.new
         @entity_store = Rack::Cache::EntityStore::Heap.new
       end
+      behaves_like 'A Rack::Cache::MetaStore Implementation'
     end
 
   end

data/test/options_test.rb

@@ -59,13 +59,13 @@ describe 'Rack::Cache::Options' do
   it 'allows the meta store to be configured' do
     @options.should.respond_to :metastore
     @options.should.respond_to :metastore=
-    @options.metastore.should.not.be nil
+    @options.metastore.should.not.be.nil
   end
 
   it 'allows the entity store to be configured' do
     @options.should.respond_to :entitystore
     @options.should.respond_to :entitystore=
-    @options.entitystore.should.not.be nil
+    @options.entitystore.should.not.be.nil
   end
 
   it 'allows log verbosity to be configured' do

data/test/request_test.rb

@@ -4,16 +4,16 @@ require 'rack/cache/request'
 describe 'Rack::Cache::Request' do
   it 'is marked as no_cache when the Cache-Control header includes the no-cache directive' do
     request = Rack::Cache::Request.new('HTTP_CACHE_CONTROL' => 'public, no-cache')
-    assert request.no_cache?
+    request.should.be.no_cache
   end
 
   it 'is marked as no_cache when request should not be loaded from cache' do
     request = Rack::Cache::Request.new('HTTP_PRAGMA' => 'no-cache')
-    assert request.no_cache?
+    request.should.be.no_cache
   end
 
   it 'is not marked as no_cache when neither no-cache directive is specified' do
     request = Rack::Cache::Request.new('HTTP_CACHE_CONTROL' => 'public')
-    assert !request.no_cache?
+    request.should.not.be.no_cache
   end
 end

data/test/response_test.rb

@@ -1,21 +1,21 @@
 require "#{File.dirname(__FILE__)}/spec_setup"
 
 describe 'Rack::Cache::Response' do
-  before :each do
+  before do
     @now = Time.httpdate(Time.now.httpdate)
     @one_hour_ago = Time.httpdate((Time.now - (60**2)).httpdate)
     @one_hour_later = Time.httpdate((Time.now + (60**2)).httpdate)
     @res = Rack::Cache::Response.new(200, {'Date' => @now.httpdate}, [])
   end
 
-  after :each do
+  after do
     @now, @res, @one_hour_ago = nil
   end
 
   it 'marks Rack tuples with string typed statuses as cacheable' do
     @res = Rack::Cache::Response.new('200',{'Date' => @now.httpdate},[])
     @res.headers['Expires'] = @one_hour_later.httpdate
-    @res.cacheable?.should.equal true
+    @res.should.be.cacheable
   end
 
   it 'responds to #to_a with a Rack response tuple' do
@@ -60,7 +60,7 @@ describe 'Rack::Cache::Response' do
     end
     it 'uses the current time when no Date header present' do
       @res = Rack::Cache::Response.new(200, {}, [])
-      @res.date.should.be.close Time.now, 1
+      @res.date.to_i.should.be.close Time.now.to_i, 1
     end
     it 'returns the correct date when the header is modified directly' do
       @res = Rack::Cache::Response.new(200, { 'Date' => @one_hour_ago.httpdate }, [])

data/test/spec_setup.rb

@@ -2,13 +2,13 @@ require 'pp'
 require 'tmpdir'
 require 'stringio'
 
-[ STDOUT, STDERR ].each { |io| io.sync = true }
+[STDOUT, STDERR].each { |io| io.sync = true }
 
 begin
-  require 'test/spec'
+  require 'bacon'
 rescue LoadError => boom
   require 'rubygems' rescue nil
-  require 'test/spec'
+  require 'bacon'
 end
 
 # Set the MEMCACHED environment variable as follows to enable testing
@@ -19,17 +19,24 @@ $dalli = nil
 
 def have_memcached?(server=ENV['MEMCACHED'])
   return $memcached unless $memcached.nil?
-  v, $VERBOSE = $VERBOSE, nil # silence warnings from memcached
-  require 'memcached'
-  $VERBOSE = v
+
+  # silence warnings from memcached
+  begin
+    v, $VERBOSE = $VERBOSE, nil
+    require 'memcached'
+  ensure
+    $VERBOSE = v
+  end
+
   $memcached = Memcached.new(server)
   $memcached.set('ping', '')
   true
 rescue LoadError => boom
+  warn "memcached library not available. related tests will be skipped."
   $memcached = false
   false
 rescue => boom
-  STDERR.puts "memcached not working. related tests will be skipped."
+  warn "memcached not working. related tests will be skipped."
   $memcached = false
   false
 end
@@ -43,10 +50,11 @@ def have_dalli?(server=ENV['MEMCACHED'])
   $dalli.set('ping', '')
   true
 rescue LoadError => boom
+  warn "dalli library not available. related tests will be skipped."
   $dalli = false
   false
 rescue => boom
-  STDERR.puts "dalli not working. related tests will be skipped."
+  warn "dalli not working. related tests will be skipped."
   $dalli = false
   false
 end
@@ -54,27 +62,15 @@ end
 have_dalli?
 
 def need_dalli(forwhat)
-  if have_dalli?
-    yield
-  else
-    STDERR.puts "skipping Dalli #{forwhat}"
-  end
+  yield if have_dalli?
 end
 
 def need_memcached(forwhat)
-  if have_memcached?
-    yield
-  else
-    STDERR.puts "skipping memcached #{forwhat}"
-  end
+  yield if have_memcached?
 end
 
 def need_java(forwhat)
-  if RUBY_PLATFORM =~ /java/
-    yield
-  else
-    STDERR.puts "skipping app engine #{forwhat}"
-  end
+  yield if RUBY_PLATFORM =~ /java/
 end
 
 
@@ -84,7 +80,6 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'rack/cache'
 
-
 # Methods for constructing downstream applications / response
 # generators.
 module CacheContextHelpers
@@ -128,18 +123,18 @@ module CacheContextHelpers
 
   def teardown_cache_context
     @app, @cache_template, @cache, @caches, @called,
-    @request, @response, @responses, @cache_config = nil
+    @request, @response, @responses, @cache_config, @cache_prototype = nil
   end
 
   # A basic response with 200 status code and a tiny body.
-  def respond_with(status=200, headers={}, body=['Hello World'])
+  def respond_with(status=200, headers={}, body=['Hello World'], &bk)
     called = false
     @app =
       lambda do |env|
         called = true
         response = Rack::Response.new(body, status, headers)
         request = Rack::Request.new(env)
-        yield request, response if block_given?
+        bk.call(request, response) if bk
         response.finish
       end
     @app.meta_def(:called?) { called }
@@ -210,7 +205,7 @@ module TestHelpers
 
 end
 
-class Test::Unit::TestCase
+class Bacon::Context
   include TestHelpers
   include CacheContextHelpers
 end

data/test/storage_test.rb

@@ -15,7 +15,7 @@ describe 'Rack::Cache::Storage' do
   end
   it "returns an existing MetaStore instance for URI that exists" do
     store = @storage.resolve_metastore_uri('heap:/')
-    @storage.resolve_metastore_uri('heap:/').should.be store
+    @storage.resolve_metastore_uri('heap:/').should.be.same_as store
   end
   it "creates a new EntityStore for URI if none exists" do
     @storage.resolve_entitystore_uri('heap:/').
@@ -23,14 +23,14 @@ describe 'Rack::Cache::Storage' do
   end
   it "returns an existing EntityStore instance for URI that exists" do
     store = @storage.resolve_entitystore_uri('heap:/')
-    @storage.resolve_entitystore_uri('heap:/').should.be store
+    @storage.resolve_entitystore_uri('heap:/').should.be.same_as store
   end
   it "clears all URI -> store mappings with #clear" do
     meta = @storage.resolve_metastore_uri('heap:/')
     entity = @storage.resolve_entitystore_uri('heap:/')
     @storage.clear
-    @storage.resolve_metastore_uri('heap:/').should.not.be meta
-    @storage.resolve_entitystore_uri('heap:/').should.not.be entity
+    @storage.resolve_metastore_uri('heap:/').should.not.be.same_as meta
+    @storage.resolve_entitystore_uri('heap:/').should.not.be.same_as entity
   end
 
   describe 'Heap Store URIs' do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rack-cache
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 -08:00
+date: 2011-04-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,24 +21,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
         version: "0.4"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: test-spec
+  name: bacon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -68,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -101,6 +84,7 @@ files:
 - doc/storage.markdown
 - example/sinatra/app.rb
 - example/sinatra/views/index.erb
+- lib/rack-cache.rb
 - lib/rack/cache.rb
 - lib/rack/cache/appengine.rb
 - lib/rack/cache/cachecontrol.rb
@@ -144,23 +128,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 2
 summary: HTTP Caching for Rack