markbates-rack_page_caching 0.1.1 → 0.1.2

data/lib/rack_page_caching/action_controller_base.rb

@@ -23,7 +23,6 @@ unless ActionController.const_defined?('CONFIGURED_PAGE_CACHING_EXTENSIONS')
         if request.get? && configatron.rack.caching.use_page_caching
           cpage = Cachetastic::Caches::PageCache.get(request.url)
           if cpage
-            response.headers['cache_this_page'] = 'false'
             response.headers["Content-Type"] = cpage.content_type
             render(:text => cpage.body, :layout => false)
             return false
@@ -33,13 +32,18 @@ unless ActionController.const_defined?('CONFIGURED_PAGE_CACHING_EXTENSIONS')
       end
     
       def write_into_rack_page_cache
-        if configatron.rack.caching.use_page_caching && request.get? && response.headers['cache_this_page'] == 'true' && response.status.match(/OK$/)
-          Cachetastic::Caches::PageCache.set(request.url, Rack::PageCaching::Middleware::Page.new(response.body, response.headers["Content-Type"]))
+        cache_control = Rack::PageCaching::Middleware.cache_controls(response.headers)
+        
+        if Rack::PageCaching::Middleware.cacheable?(request, response.status.to_i, response.headers) 
+          Rack::PageCaching::Middleware.set_into_cache(request.url, 
+                                                       response.body, 
+                                                       response.headers["Content-Type"], 
+                                                       cache_control[:max_age])
         end
       end
     
       def set_rack_page_caching_header
-        response.headers['cache_this_page'] = 'true'
+        expires_in configatron.cachetastic_caches_page_cache_options.default_expiry, :private => false, :public => true
       end
     
     end # Base

data/lib/rack_page_caching/rack_page_caching.rb

@@ -21,8 +21,9 @@ module Rack
           ret = @app.call(env)
           unless ret[2].is_a?(Rack::File)
             res = ret[2]
-            if res["cache_this_page"] && res.successful? && request.get?
-              Cachetastic::Caches::PageCache.set(request.fullpath, Rack::PageCaching::Middleware::Page.new(res.body, res["Content-Type"]))
+            cache_control = Rack::PageCaching::Middleware.cache_controls(res)
+            if Rack::PageCaching::Middleware.cacheable?(request, res.status, res)
+              Rack::PageCaching::Middleware.set_into_cache(request.fullpath, res.body, res["Content-Type"], cache_control[:max_age])
             end
           end
           return ret
@@ -54,6 +55,33 @@ module Rack
         
       end # Page
       
+      class << self
+        
+        def cache_controls(headers)
+          cc_header = headers['Cache-Control'] || 'private'
+          cache_control = {:public => (!cc_header.match(/public/).nil? && 
+                                       cc_header.match(/private/).nil?), 
+                           :max_age => configatron.cachetastic_caches_page_cache_options.default_expiry}
+          cc_header.match(/max-age=(\d+)/)
+          cache_control[:max_age] = $1 unless $1.nil?
+          cache_control
+        end
+        
+        def cacheable?(request, status, headers)
+          if configatron.rack.caching.use_page_caching
+            cache_control = Rack::PageCaching::Middleware.cache_controls(headers)
+            return cache_control[:public] && request.get? && (status.to_i >= 200 && status.to_i < 300)
+          end
+          return false
+        end
+        
+        def set_into_cache(url, body, content_type, expiry = configatron.cachetastic_caches_page_cache_options.default_expiry)
+          Cachetastic::Caches::PageCache.set(url, Rack::PageCaching::Middleware::Page.new(body, content_type),                                        
+                                             expiry.to_i)
+        end
+        
+      end # class << self
+      
     end # Middleware
   end # PageCaching
 end # Rack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markbates-rack_page_caching
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -07:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency