beats-rack 0.1.0 → 0.2.0

data/HISTORY.md

@@ -1,4 +1,8 @@
 
+### 0.2.0 (2012-04-16)
+
+* Added a monkey patched version of rack-cache
+
 ### 0.1.0 (2012-04-12)
 
 * Added a CORS middleware

data/README.md

@@ -5,3 +5,4 @@ An assorted collection of Goliath compatible Rack middleware.
 
 * Beats::Rack::Cors - Adds Cross-Origin Resource Sharing headers for cross-domain Ajax calls.
 * Beats::Rack::NoCache - Adds cache headers that tells clients that the response should never be cached.
+* Beats::Rack::Cache - Monkey patched version of Rack::Cache that works with Goliath.

data/beats-rack.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'goliath'
+  s.add_dependency 'rack-cache'
+  s.add_dependency 'dalli'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'redcarpet'

data/lib/beats/rack.rb

@@ -1,3 +1,4 @@
 require 'rubygems'
+require 'beats/rack/cache'
 require 'beats/rack/cors'
 require 'beats/rack/no_cache'

data/lib/beats/rack/cache.rb

@@ -0,0 +1,41 @@
+require 'rack-cache'
+require 'goliath/rack'
+require 'async-rack'
+
+module Rack::Cache
+  class Context
+    include AsyncRack::AsyncCallback::Mixin
+    
+    def async_callback(result)
+      response = Response.new(*result)
+      @request ||= Request.new(env.dup.freeze)
+      store response if response.cacheable?
+      super result
+    end
+    
+    def call(env)
+      setup_async env
+      if env['rack.run_once']
+        call! env
+      else
+        clone.call! env
+      end
+    end
+  end
+end
+
+module Beats
+  module Rack
+    class Cache < ::Rack::Cache::Context
+
+      def initialize(app, options={}, &b)
+        options = {
+          :metastore => ENV['MEMCACHE_SERVERS'] ? "memcache://#{ENV['MEMCACHE_SERVERS']}/meta" : 'heap:/',
+          :entitystore => ENV['MEMCACHE_SERVERS'] ? "memcache://#{ENV['MEMCACHE_SERVERS']}/body" : 'heap:/'
+        }.merge(options)
+        super(app, options, &b)
+      end
+
+    end
+  end
+end

data/lib/beats/version.rb

@@ -1,5 +1,5 @@
 module Beats
   module Rack
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/test/cache_test.rb

@@ -0,0 +1,29 @@
+require File.expand_path('test/test_helper')
+
+class CacheTest < Test::Unit::TestCase
+
+  def setup
+    @app = lambda do |env|
+      [200, { 'X-Test' => 'test', 'Cache-Control' => 'max-age=3600' }, ['test']]
+    end
+    @env = Goliath::Env.new
+    @env['PATH_INFO'] = '/'
+    @env['REQUEST_METHOD'] = 'GET'
+  end
+
+  def test_should_cache_the_response
+    res = Beats::Rack::Cache.new(@app, :verbose => false).call(@env)
+    assert_equal 200, res[0]
+    assert_equal 'test', res[1]['X-Test']
+    assert_equal 'max-age=3600', res[1]['Cache-Control']
+    assert_equal 'miss, store', res[1]['X-Rack-Cache']
+    assert_equal ['test'], res[2]
+    res = Beats::Rack::Cache.new(@app, :verbose => false).call(@env)
+    assert_equal 200, res[0]
+    assert_equal 'test', res[1]['X-Test']
+    assert_equal 'max-age=3600', res[1]['Cache-Control']
+    assert_equal 'fresh', res[1]['X-Rack-Cache']
+    assert_equal ['test'], res[2]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beats-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70107904959620 !ruby/object:Gem::Requirement
+  requirement: &70121402433840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107904959620
+  version_requirements: *70121402433840
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: &70121402433160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70121402433160
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: &70121402432620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70121402432620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70107904959200 !ruby/object:Gem::Requirement
+  requirement: &70121402432080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107904959200
+  version_requirements: *70121402432080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70107904958760 !ruby/object:Gem::Requirement
+  requirement: &70121402431640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107904958760
+  version_requirements: *70121402431640
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70107904958340 !ruby/object:Gem::Requirement
+  requirement: &70121402431160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107904958340
+  version_requirements: *70121402431160
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &70107904957920 !ruby/object:Gem::Requirement
+  requirement: &70121402430720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107904957920
+  version_requirements: *70121402430720
 description: An assorted collection of Goliath compatible Rack middleware.
 email:
 - niklas@sutajio.se
@@ -82,9 +104,11 @@ files:
 - Rakefile
 - beats-rack.gemspec
 - lib/beats/rack.rb
+- lib/beats/rack/cache.rb
 - lib/beats/rack/cors.rb
 - lib/beats/rack/no_cache.rb
 - lib/beats/version.rb
+- test/cache_test.rb
 - test/cors_test.rb
 - test/no_cache_test.rb
 - test/test_helper.rb
@@ -113,6 +137,7 @@ signing_key:
 specification_version: 3
 summary: An assorted collection of Goliath compatible Rack middleware.
 test_files:
+- test/cache_test.rb
 - test/cors_test.rb
 - test/no_cache_test.rb
 - test/test_helper.rb