rack-cache 0.3.0 → 0.4

data/lib/rack/cache/storage.rb

@@ -3,11 +3,11 @@ require 'rack/cache/metastore'
 require 'rack/cache/entitystore'
 
 module Rack::Cache
+
   # Maintains a collection of MetaStore and EntityStore instances keyed by
   # URI. A single instance of this class can be used across a single process
   # to ensure that only a single instance of a backing store is created per
   # unique storage URI.
-
   class Storage
     def initialize
       @metastores = {}
@@ -22,7 +22,6 @@ module Rack::Cache
       @entitystores[uri.to_s] ||= create_store(EntityStore, uri)
     end
 
-    # Clear store instances.
     def clear
       @metastores.clear
       @entitystores.clear

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 = '0.3.0'
-  s.date = '2008-12-28'
+  s.version = '0.4'
+  s.date = '2009-03-16'
 
   s.description = "HTTP Caching for Rack"
   s.summary     = "HTTP Caching for Rack"
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     Rakefile
     TODO
     doc/configuration.markdown
-    doc/events.dot
     doc/faq.markdown
     doc/index.markdown
     doc/layout.html.erb
@@ -28,33 +27,28 @@ Gem::Specification.new do |s|
     doc/rack-cache.css
     doc/server.ru
     doc/storage.markdown
+    example/sinatra/app.rb
+    example/sinatra/views/index.erb
     lib/rack/cache.rb
-    lib/rack/cache/config.rb
-    lib/rack/cache/config/busters.rb
-    lib/rack/cache/config/default.rb
-    lib/rack/cache/config/no-cache.rb
+    lib/rack/cache/cachecontrol.rb
     lib/rack/cache/context.rb
-    lib/rack/cache/core.rb
     lib/rack/cache/entitystore.rb
-    lib/rack/cache/headers.rb
+    lib/rack/cache/key.rb
     lib/rack/cache/metastore.rb
     lib/rack/cache/options.rb
     lib/rack/cache/request.rb
     lib/rack/cache/response.rb
     lib/rack/cache/storage.rb
-    lib/rack/utils/environment_headers.rb
     rack-cache.gemspec
     test/cache_test.rb
-    test/config_test.rb
+    test/cachecontrol_test.rb
     test/context_test.rb
-    test/core_test.rb
     test/entitystore_test.rb
-    test/environment_headers_test.rb
-    test/headers_test.rb
-    test/logging_test.rb
+    test/key_test.rb
     test/metastore_test.rb
     test/options_test.rb
     test/pony.jpg
+    test/request_test.rb
     test/response_test.rb
     test/spec_setup.rb
     test/storage_test.rb

data/test/cache_test.rb

@@ -12,24 +12,27 @@ describe 'Rack::Cache::new' do
     Rack::Cache.new(@app).
       should.respond_to :call
   end
+
   it 'takes an options Hash' do
     lambda { Rack::Cache.new(@app, {}) }.
       should.not.raise(ArgumentError)
   end
+
   it 'sets options provided in the options Hash' do
     object = Rack::Cache.new(@app, :foo => 'bar', 'foo.bar' => 'bling')
     object.options['foo.bar'].should.equal 'bling'
     object.options['rack-cache.foo'].should.equal 'bar'
   end
+
   it 'takes a block; executes it during initialization' do
-    state, block_scope = 'not invoked', nil
-    object =
-      Rack::Cache.new @app do
-        block_scope = self
+    state, object  = 'not invoked', nil
+    instance =
+      Rack::Cache.new @app do |cache|
+        object = cache
         state = 'invoked'
-        should.respond_to :on
+        cache.should.respond_to :set
       end
     state.should.equal 'invoked'
-    object.should.be block_scope
+    object.should.be instance
   end
 end

data/test/cachecontrol_test.rb

@@ -0,0 +1,139 @@
+require "#{File.dirname(__FILE__)}/spec_setup"
+require 'rack/cache/cachecontrol'
+
+describe 'Rack::Cache::CacheControl' do
+  it 'takes no args and initializes with an empty set of values' do
+    cache_control = Rack::Cache::CacheControl.new
+    cache_control.should.be.empty
+    cache_control.to_s.should.equal ''
+  end
+
+  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
+  end
+
+  it 'takes a String with a single name=value pair' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600')
+    cache_control['max-age'].should.equal '600'
+  end
+
+  it 'takes a String with multiple name=value pairs' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600, max-stale=300, min-fresh=570')
+    cache_control['max-age'].should.equal '600'
+    cache_control['max-stale'].should.equal '300'
+    cache_control['min-fresh'].should.equal '570'
+  end
+
+  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
+  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['min-fresh'].should.equal '3000'
+    cache_control['foo'].should.equal 'bar'
+    cache_control['baz'].should.be true
+  end
+
+  it 'strips leading and trailing spaces from header value' do
+    cache_control = Rack::Cache::CacheControl.new('   public,   max-age =   600  ')
+    cache_control.should.include 'public'
+    cache_control.should.include 'max-age'
+    cache_control['max-age'].should.equal '600'
+  end
+
+  it 'removes all directives with #clear' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600, must-revalidate')
+    cache_control.clear
+    cache_control.should.be.empty
+  end
+
+  it 'converts self into header String with #to_s' do
+    cache_control = Rack::Cache::CacheControl.new
+    cache_control['public'] = true
+    cache_control['max-age'] = '600'
+    cache_control.to_s.split(', ').sort.should.equal ['max-age=600', 'public']
+  end
+
+  it 'sorts alphabetically with boolean directives before value directives' do
+    cache_control = Rack::Cache::CacheControl.new('foo=bar, z, x, y, bling=baz, zoom=zib, b, a')
+    cache_control.to_s.should.equal 'a, b, x, y, z, bling=baz, foo=bar, zoom=zib'
+  end
+
+  it 'responds to #max_age with an integer when max-age directive present' do
+    cache_control = Rack::Cache::CacheControl.new('public, max-age=600')
+    cache_control.max_age.should.equal 600
+  end
+
+  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
+  end
+
+  it 'responds to #shared_max_age with an integer when s-maxage directive present' do
+    cache_control = Rack::Cache::CacheControl.new('public, s-maxage=600')
+    cache_control.shared_max_age.should.equal 600
+  end
+
+  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
+  end
+
+  it 'responds to #public? truthfully when public directive present' do
+    cache_control = Rack::Cache::CacheControl.new('public')
+    cache_control.should.be.public
+  end
+
+  it 'responds to #public? non-truthfully when no public directive present' do
+    cache_control = Rack::Cache::CacheControl.new('private')
+    cache_control.should.not.be.public
+  end
+
+  it 'responds to #private? truthfully when private directive present' do
+    cache_control = Rack::Cache::CacheControl.new('private')
+    cache_control.should.be.private
+  end
+
+  it 'responds to #private? non-truthfully when no private directive present' do
+    cache_control = Rack::Cache::CacheControl.new('public')
+    cache_control.should.not.be.private
+  end
+
+  it 'responds to #no_cache? truthfully when no-cache directive present' do
+    cache_control = Rack::Cache::CacheControl.new('no-cache')
+    cache_control.should.be.no_cache
+  end
+
+  it 'responds to #no_cache? non-truthfully when no no-cache directive present' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600')
+    cache_control.should.not.be.no_cache
+  end
+
+  it 'responds to #must_revalidate? truthfully when must-revalidate directive present' do
+    cache_control = Rack::Cache::CacheControl.new('must-revalidate')
+    cache_control.should.be.must_revalidate
+  end
+
+  it 'responds to #must_revalidate? non-truthfully when no must-revalidate directive present' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600')
+    cache_control.should.not.be.no_cache
+  end
+
+  it 'responds to #proxy_revalidate? truthfully when proxy-revalidate directive present' do
+    cache_control = Rack::Cache::CacheControl.new('proxy-revalidate')
+    cache_control.should.be.proxy_revalidate
+  end
+
+  it 'responds to #proxy_revalidate? non-truthfully when no proxy-revalidate directive present' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600')
+    cache_control.should.not.be.no_cache
+  end
+end

data/test/context_test.rb

@@ -11,21 +11,31 @@ describe 'Rack::Cache::Context' do
 
     app.should.be.called
     response.should.be.ok
-    cache.should.a.performed :pass
+    cache.trace.should.include :pass
     response.headers.should.not.include 'Age'
   end
 
+  %w[post put delete].each do |request_method|
+    it "invalidates on #{request_method} requests" do
+      respond_with 200
+      request request_method, '/'
+
+      app.should.be.called
+      response.should.be.ok
+      cache.trace.should.include :invalidate
+      cache.trace.should.include :pass
+    end
+  end
+
   it 'does not cache with Authorization request header and non public response' do
-    respond_with 200, 'Etag' => '"FOO"'
+    respond_with 200, 'ETag' => '"FOO"'
     get '/', 'HTTP_AUTHORIZATION' => 'basic foobarbaz'
 
     app.should.be.called
     response.should.be.ok
     response.headers['Cache-Control'].should.equal 'private'
-    cache.should.a.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.not.performed :store
-    cache.should.a.performed :deliver
+    cache.trace.should.include :miss
+    cache.trace.should.not.include :store
     response.headers.should.not.include 'Age'
   end
 
@@ -35,24 +45,21 @@ describe 'Rack::Cache::Context' do
 
     app.should.be.called
     response.should.be.ok
-    cache.should.a.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     response.headers.should.include 'Age'
     response.headers['Cache-Control'].should.equal 'public'
   end
 
   it 'does not cache with Cookie header and non public response' do
-    respond_with 200, 'Etag' => '"FOO"'
+    respond_with 200, 'ETag' => '"FOO"'
     get '/', 'HTTP_COOKIE' => 'foo=bar'
 
     app.should.be.called
     response.should.be.ok
     response.headers['Cache-Control'].should.equal 'private'
-    cache.should.a.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.not.performed :store
-    cache.should.a.performed :deliver
+    cache.trace.should.include :miss
+    cache.trace.should.not.include :store
     response.headers.should.not.include 'Age'
   end
 
@@ -62,9 +69,8 @@ describe 'Rack::Cache::Context' do
 
     response.should.be.ok
     app.should.be.called
-    cache.should.a.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.performed :deliver
+    cache.trace.should.include :miss
+    cache.trace.should.not.include :store
     response.headers.should.not.include 'Age'
     response.headers['Cache-Control'].should.equal 'private'
   end
@@ -85,14 +91,14 @@ describe 'Rack::Cache::Context' do
     response.headers.should.not.include 'Content-Length'
     response.headers.should.not.include 'Content-Type'
     response.body.should.empty
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
   end
 
   it 'responds with 304 when If-None-Match matches ETag' do
     respond_with do |req,res|
       res.status = 200
-      res['Etag'] = '12345'
+      res['ETag'] = '12345'
       res['Content-Type'] = 'text/plain'
       res.body = ['Hello World']
     end
@@ -103,28 +109,131 @@ describe 'Rack::Cache::Context' do
     response.status.should.equal 304
     response.headers.should.not.include 'Content-Length'
     response.headers.should.not.include 'Content-Type'
-    response.headers.should.include 'Etag'
+    response.headers.should.include 'ETag'
     response.body.should.empty
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
   end
 
-  it 'caches requests when Cache-Control request header set to no-cache' do
+  it 'stores responses when no-cache request directive present' do
     respond_with 200, 'Expires' => (Time.now + 5).httpdate
-    get '/', 'HTTP_CACHE_CONTROL' => 'no-cache'
 
+    get '/', 'HTTP_CACHE_CONTROL' => 'no-cache'
     response.should.be.ok
-    cache.should.a.performed :store
+    cache.trace.should.include :store
     response.headers.should.include 'Age'
   end
 
+  it 'reloads responses when cache hits but no-cache request directive present' do
+    count = 0
+    respond_with 200, 'Cache-Control' => 'max-age=10000' do |req,res|
+      count+= 1
+      res.body = (count == 1) ? ['Hello World'] : ['Goodbye World']
+    end
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :store
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :fresh
+
+    get '/', 'HTTP_CACHE_CONTROL' => 'no-cache'
+    response.should.be.ok
+    response.body.should.equal 'Goodbye World'
+    cache.trace.should.include :reload
+    cache.trace.should.include :store
+  end
+
+  it 'does not reload responses when allow_reload is set false' do
+    count = 0
+    respond_with 200, 'Cache-Control' => 'max-age=10000' do |req,res|
+      count+= 1
+      res.body = (count == 1) ? ['Hello World'] : ['Goodbye World']
+    end
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :store
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :fresh
+
+    get '/',
+      'rack-cache.allow_reload' => false,
+      'HTTP_CACHE_CONTROL' => 'no-cache'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.not.include :reload
+  end
+
+  it 'revalidates fresh cache entry when max-age request directive is exceeded' do
+    count = 0
+    respond_with do |req,res|
+      count+= 1
+      res['Cache-Control'] = 'max-age=10000'
+      res['ETag'] = count.to_s
+      res.body = (count == 1) ? ['Hello World'] : ['Goodbye World']
+    end
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :store
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :fresh
+
+    get '/', 'HTTP_CACHE_CONTROL' => 'max-age=0'
+    response.should.be.ok
+    response.body.should.equal 'Goodbye World'
+    cache.trace.should.include :stale
+    cache.trace.should.include :invalid
+    cache.trace.should.include :store
+  end
+
+  it 'does not revalidate fresh cache entry when enable_revalidate option is set false' do
+    count = 0
+    respond_with do |req,res|
+      count+= 1
+      res['Cache-Control'] = 'max-age=10000'
+      res['ETag'] = count.to_s
+      res.body = (count == 1) ? ['Hello World'] : ['Goodbye World']
+    end
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :store
+
+    get '/'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :fresh
+
+    get '/',
+      'rack-cache.allow_revalidate' => false,
+      'HTTP_CACHE_CONTROL' => 'max-age=0'
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.not.include :stale
+    cache.trace.should.not.include :invalid
+    cache.trace.should.include :fresh
+  end
   it 'fetches response from backend when cache misses' do
     respond_with 200, 'Expires' => (Time.now + 5).httpdate
     get '/'
 
     response.should.be.ok
-    cache.should.a.performed :miss
-    cache.should.a.performed :fetch
+    cache.trace.should.include :miss
     response.headers.should.include 'Age'
   end
 
@@ -134,7 +243,7 @@ describe 'Rack::Cache::Context' do
         respond_with response_code, 'Expires' => (Time.now + 5).httpdate
         get '/'
 
-        cache.should.a.not.performed :store
+        cache.trace.should.not.include :store
         response.status.should.equal response_code
         response.headers.should.not.include 'Age'
       end
@@ -148,7 +257,7 @@ describe 'Rack::Cache::Context' do
     get '/'
 
     response.should.be.ok
-    cache.should.a.not.performed :store
+    cache.trace.should.not.include :store
     response.headers.should.not.include 'Age'
   end
 
@@ -157,7 +266,7 @@ describe 'Rack::Cache::Context' do
     get '/'
 
     response.should.be.ok
-    cache.should.a.not.performed :store
+    cache.trace.should.not.include :store
   end
 
   it "caches responses with explicit no-cache directive" do
@@ -167,7 +276,7 @@ describe 'Rack::Cache::Context' do
     get '/'
 
     response.should.be.ok
-    cache.should.a.performed :store
+    cache.trace.should.include :store
     response.headers.should.include 'Age'
   end
 
@@ -180,8 +289,8 @@ describe 'Rack::Cache::Context' do
     response.headers.should.include 'Date'
     response['Age'].should.not.be.nil
     response['X-Content-Digest'].should.not.be.nil
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     cache.metastore.to_hash.keys.length.should.equal 1
   end
 
@@ -194,8 +303,8 @@ describe 'Rack::Cache::Context' do
     response.headers.should.include 'Date'
     response['Age'].should.not.be.nil
     response['X-Content-Digest'].should.not.be.nil
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     cache.metastore.to_hash.keys.length.should.equal 1
   end
 
@@ -208,8 +317,8 @@ describe 'Rack::Cache::Context' do
     response.headers.should.include 'Date'
     response['Age'].should.not.be.nil
     response['X-Content-Digest'].should.not.be.nil
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     cache.metastore.to_hash.keys.length.should.equal 1
   end
 
@@ -219,18 +328,18 @@ describe 'Rack::Cache::Context' do
 
     response.should.be.ok
     response.body.should.equal 'Hello World'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
   end
 
   it 'caches responses with an ETag validator but no freshness information' do
-    respond_with 200, 'Etag' => '"123456"'
+    respond_with 200, 'ETag' => '"123456"'
     get '/'
 
     response.should.be.ok
     response.body.should.equal 'Hello World'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
   end
 
   it 'hits cached response with Expires header' do
@@ -242,8 +351,8 @@ describe 'Rack::Cache::Context' do
     app.should.be.called
     response.should.be.ok
     response.headers.should.include 'Date'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     response.body.should.equal 'Hello World'
 
     get '/'
@@ -252,8 +361,8 @@ describe 'Rack::Cache::Context' do
     response['Date'].should.equal responses.first['Date']
     response['Age'].to_i.should.satisfy { |age| age > 0 }
     response['X-Content-Digest'].should.not.be.nil
-    cache.should.a.performed :hit
-    cache.should.a.not.performed :fetch
+    cache.trace.should.include :fresh
+    cache.trace.should.not.include :store
     response.body.should.equal 'Hello World'
   end
 
@@ -266,8 +375,8 @@ describe 'Rack::Cache::Context' do
     app.should.be.called
     response.should.be.ok
     response.headers.should.include 'Date'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     response.body.should.equal 'Hello World'
 
     get '/'
@@ -276,8 +385,8 @@ describe 'Rack::Cache::Context' do
     response['Date'].should.equal responses.first['Date']
     response['Age'].to_i.should.satisfy { |age| age > 0 }
     response['X-Content-Digest'].should.not.be.nil
-    cache.should.a.performed :hit
-    cache.should.a.not.performed :fetch
+    cache.trace.should.include :fresh
+    cache.trace.should.not.include :store
     response.body.should.equal 'Hello World'
   end
 
@@ -290,8 +399,8 @@ describe 'Rack::Cache::Context' do
     app.should.be.called
     response.should.be.ok
     response.headers.should.include 'Date'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     response.body.should.equal 'Hello World'
 
     get '/'
@@ -300,8 +409,8 @@ describe 'Rack::Cache::Context' do
     response['Date'].should.equal responses.first['Date']
     response['Age'].to_i.should.satisfy { |age| age > 0 }
     response['X-Content-Digest'].should.not.be.nil
-    cache.should.a.performed :hit
-    cache.should.a.not.performed :fetch
+    cache.trace.should.include :fresh
+    cache.trace.should.not.include :store
     response.body.should.equal 'Hello World'
   end
 
@@ -311,16 +420,16 @@ describe 'Rack::Cache::Context' do
     get '/', 'rack-cache.default_ttl' => 10
     app.should.be.called
     response.should.be.ok
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     response.body.should.equal 'Hello World'
     response['Cache-Control'].should.include 's-maxage=10'
 
     get '/', 'rack-cache.default_ttl' => 10
     response.should.be.ok
     app.should.not.be.called
-    cache.should.a.performed :hit
-    cache.should.a.not.performed :fetch
+    cache.trace.should.include :fresh
+    cache.trace.should.not.include :store
     response.body.should.equal 'Hello World'
   end
 
@@ -331,8 +440,8 @@ describe 'Rack::Cache::Context' do
     get '/', 'rack-cache.default_ttl' => 10
     app.should.be.called
     response.should.be.ok
-    cache.should.a.performed :miss
-    cache.should.a.not.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.not.include :store
     response['Cache-Control'].should.not.include 's-maxage'
     response.body.should.equal 'Hello World'
   end
@@ -347,8 +456,8 @@ describe 'Rack::Cache::Context' do
     response.headers.should.include 'Date'
     response.headers.should.include 'X-Content-Digest'
     response.headers.should.include 'Age'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
     response.body.should.equal 'Hello World'
 
     # go in and play around with the cached metadata directly ...
@@ -361,10 +470,10 @@ describe 'Rack::Cache::Context' do
     response.should.be.ok
     response['Age'].to_i.should.equal 0
     response.headers.should.include 'X-Content-Digest'
-    cache.should.a.not.performed :hit
-    cache.should.a.not.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.performed :store
+    cache.trace.should.include :stale
+    cache.trace.should.not.include :fresh
+    cache.trace.should.not.include :miss
+    cache.trace.should.include :store
     response.body.should.equal 'Hello World'
   end
 
@@ -385,8 +494,9 @@ describe 'Rack::Cache::Context' do
     response.headers.should.include 'Last-Modified'
     response.headers.should.include 'X-Content-Digest'
     response.body.should.equal 'Hello World'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
+    cache.trace.should.not.include :stale
 
     # build subsequent request; should be found but miss due to freshness
     get '/'
@@ -395,11 +505,11 @@ describe 'Rack::Cache::Context' do
     response.headers.should.include 'Last-Modified'
     response.headers.should.include 'X-Content-Digest'
     response['Age'].to_i.should.equal 0
-    response['X-Origin-Status'].should.equal '304'
     response.body.should.equal 'Hello World'
-    cache.should.a.not.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.performed :store
+    cache.trace.should.include :stale
+    cache.trace.should.include :valid
+    cache.trace.should.include :store
+    cache.trace.should.not.include :miss
   end
 
   it 'validates cached responses with ETag and no freshness information' do
@@ -416,24 +526,24 @@ describe 'Rack::Cache::Context' do
     get '/'
     app.should.be.called
     response.should.be.ok
-    response.headers.should.include 'Etag'
+    response.headers.should.include 'ETag'
     response.headers.should.include 'X-Content-Digest'
     response.body.should.equal 'Hello World'
-    cache.should.a.performed :miss
-    cache.should.a.performed :store
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
 
     # build subsequent request; should be found but miss due to freshness
     get '/'
     app.should.be.called
     response.should.be.ok
-    response.headers.should.include 'Etag'
+    response.headers.should.include 'ETag'
     response.headers.should.include 'X-Content-Digest'
     response['Age'].to_i.should.equal 0
-    response['X-Origin-Status'].should.equal '304'
     response.body.should.equal 'Hello World'
-    cache.should.a.not.performed :miss
-    cache.should.a.performed :fetch
-    cache.should.a.performed :store
+    cache.trace.should.include :stale
+    cache.trace.should.include :valid
+    cache.trace.should.include :store
+    cache.trace.should.not.include :miss
   end
 
   it 'replaces cached responses when validation results in non-304 response' do
@@ -442,8 +552,8 @@ describe 'Rack::Cache::Context' do
     respond_with do |req,res|
       res['Last-Modified'] = timestamp
       case (count+=1)
-      when 1 ; res.body = 'first response'
-      when 2 ; res.body = 'second response'
+      when 1 ; res.body = ['first response']
+      when 2 ; res.body = ['second response']
       when 3
         res.body = []
         res.status = 304
@@ -475,11 +585,7 @@ describe 'Rack::Cache::Context' do
       req.request_method.should.equal 'HEAD'
     end
 
-    cache_config do
-      on(:receive) { pass! }
-    end
-
-    head '/'
+    head '/', 'HTTP_EXPECT' => 'something ...'
     app.should.be.called
     response.body.should.equal ''
   end
@@ -503,6 +609,53 @@ describe 'Rack::Cache::Context' do
     response['Content-Length'].should.equal 'Hello World'.length.to_s
   end
 
+  it 'invalidates cached responses on POST' do
+    respond_with do |req,res|
+      if req.request_method == 'GET'
+        res.status = 200
+        res['Cache-Control'] = 'public, max-age=500'
+        res.body = ['Hello World']
+      elsif req.request_method == 'POST'
+        res.status = 303
+        res['Location'] = '/'
+        res.headers.delete('Cache-Control')
+        res.body = []
+      end
+    end
+
+    # build initial request to enter into the cache
+    get '/'
+    app.should.be.called
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :miss
+    cache.trace.should.include :store
+
+    # make sure it is valid
+    get '/'
+    app.should.not.called
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :fresh
+
+    # now POST to same URL
+    post '/'
+    app.should.be.called
+    response.should.be.redirect
+    response['Location'].should.equal '/'
+    cache.trace.should.include :invalidate
+    cache.trace.should.include :pass
+    response.body.should.equal ''
+
+    # now make sure it was actually invalidated
+    get '/'
+    app.should.be.called
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
+    cache.trace.should.include :stale
+    cache.trace.should.include :invalid
+    cache.trace.should.include :store
+  end
 
   describe 'with responses that include a Vary header' do
     before(:each) do
@@ -511,7 +664,7 @@ describe 'Rack::Cache::Context' do
         res['Vary'] = 'Accept User-Agent Foo'
         res['Cache-Control'] = 'max-age=10'
         res['X-Response-Count'] = (count+=1).to_s
-        res.body = req.env['HTTP_USER_AGENT']
+        res.body = [req.env['HTTP_USER_AGENT']]
       end
     end
 
@@ -521,16 +674,16 @@ describe 'Rack::Cache::Context' do
         'HTTP_USER_AGENT' => 'Bob/1.0'
       response.should.be.ok
       response.body.should.equal 'Bob/1.0'
-      cache.should.a.performed :miss
-      cache.should.a.performed :store
+      cache.trace.should.include :miss
+      cache.trace.should.include :store
 
       get '/',
         'HTTP_ACCEPT' => 'text/html',
         'HTTP_USER_AGENT' => 'Bob/1.0'
       response.should.be.ok
       response.body.should.equal 'Bob/1.0'
-      cache.should.a.performed :hit
-      cache.should.a.not.performed :fetch
+      cache.trace.should.include :fresh
+      cache.trace.should.not.include :store
       response.headers.should.include 'X-Content-Digest'
     end
 
@@ -545,101 +698,30 @@ describe 'Rack::Cache::Context' do
       get '/',
         'HTTP_ACCEPT' => 'text/html',
         'HTTP_USER_AGENT' => 'Bob/2.0'
-      cache.should.a.performed :miss
-      cache.should.a.performed :store
+      cache.trace.should.include :miss
+      cache.trace.should.include :store
       response.body.should.equal 'Bob/2.0'
       response['X-Response-Count'].should.equal '2'
 
       get '/',
         'HTTP_ACCEPT' => 'text/html',
         'HTTP_USER_AGENT' => 'Bob/1.0'
-      cache.should.a.performed :hit
+      cache.trace.should.include :fresh
       response.body.should.equal 'Bob/1.0'
       response['X-Response-Count'].should.equal '1'
 
       get '/',
         'HTTP_ACCEPT' => 'text/html',
         'HTTP_USER_AGENT' => 'Bob/2.0'
-      cache.should.a.performed :hit
+      cache.trace.should.include :fresh
       response.body.should.equal 'Bob/2.0'
       response['X-Response-Count'].should.equal '2'
 
       get '/',
         'HTTP_USER_AGENT' => 'Bob/2.0'
-      cache.should.a.performed :miss
+      cache.trace.should.include :miss
       response.body.should.equal 'Bob/2.0'
       response['X-Response-Count'].should.equal '3'
     end
   end
-
-  describe 'when transitioning to the error state' do
-
-    setup { respond_with(200) }
-
-    it 'creates a blank slate response object with 500 status with no args' do
-      cache_config do
-        on(:receive) { error! }
-      end
-      get '/'
-      response.status.should.equal 500
-      response.body.should.be.empty
-      cache.should.a.performed :error
-    end
-
-    it 'sets the status code with one arg' do
-      cache_config do
-        on(:receive) { error! 505 }
-      end
-      get '/'
-      response.status.should.equal 505
-    end
-
-    it 'sets the status and headers with args: status, Hash' do
-      cache_config do
-        on(:receive) { error! 504, 'Content-Type' => 'application/x-foo' }
-      end
-      get '/'
-      response.status.should.equal 504
-      response['Content-Type'].should.equal 'application/x-foo'
-      response.body.should.be.empty
-    end
-
-    it 'sets the status and body with args: status, String' do
-      cache_config do
-        on(:receive) { error! 503, 'foo bar baz' }
-      end
-      get '/'
-      response.status.should.equal 503
-      response.body.should.equal 'foo bar baz'
-    end
-
-    it 'sets the status and body with args: status, Array' do
-      cache_config do
-        on(:receive) { error! 503, ['foo bar baz'] }
-      end
-      get '/'
-      response.status.should.equal 503
-      response.body.should.equal 'foo bar baz'
-    end
-
-    it 'fires the error event before finishing' do
-      fired = false
-      cache_config do
-        on(:receive) { error! }
-        on(:error) {
-          fired = true
-          response.status.should.equal 500
-          response['Content-Type'] = 'application/x-foo'
-          response.body = ['overridden response body']
-        }
-      end
-      get '/'
-      fired.should.be true
-      response.status.should.equal 500
-      response.body.should.equal 'overridden response body'
-      response['Content-Type'].should.equal 'application/x-foo'
-    end
-
-  end
-
 end