markbates-rack_page_caching 0.1.6 → 0.1.8

data/lib/rack_page_caching/action_controller_base.rb

@@ -22,7 +22,7 @@ unless ActionController.const_defined?('CONFIGURED_PAGE_CACHING_EXTENSIONS')
       def read_from_rack_page_cache
         begin
           if request.get? && configatron.rack.caching.use_page_caching
-            cpage = Cachetastic::Caches::PageCache.get(Rack::PageCaching::Middleware.generate_key(request.url))
+            cpage = Rack::PageCaching::Middleware::Cache.get(Rack::PageCaching::Middleware.generate_key(request.url))
             if cpage
               response.headers["Content-Type"] = cpage.content_type
               render(:text => cpage.body, :layout => false)
@@ -48,7 +48,7 @@ unless ActionController.const_defined?('CONFIGURED_PAGE_CACHING_EXTENSIONS')
       end
     
       def set_rack_page_caching_header
-        expires_in configatron.cachetastic_caches_page_cache_options.default_expiry, :private => false, :public => true
+        expires_in Rack::PageCaching::Middleware::Cache.adapter.default_expiry, :private => false, :public => true
       end
     
     end # Base

data/lib/rack_page_caching/rack_page_caching.rb

@@ -12,7 +12,7 @@ module Rack
           request = Rack::Request.new(env)
           if request.get?
             begin
-              page = Cachetastic::Caches::PageCache.get(Rack::PageCaching::Middleware.generate_key(request.url))
+              page = Rack::PageCaching::Middleware::Cache.get(Rack::PageCaching::Middleware.generate_key(request.url))
               if page
                 response = Rack::Response.new
                 response["Content-Type"] = page.content_type
@@ -36,6 +36,9 @@ module Rack
         end
         return @app.call(env)
       end
+      
+      class Cache < Cachetastic::Cache # :nodoc:
+      end
 
       class Page # :nodoc:
         
@@ -68,7 +71,7 @@ module Rack
           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}
+                           :max_age => Rack::PageCaching::Middleware::Cache.adapter.default_expiry}
           cc_header.match(/max-age=(\d+)/)
           cache_control[:max_age] = $1 unless $1.nil?
           cache_control
@@ -82,9 +85,9 @@ module Rack
           return false
         end
         
-        def set_into_cache(url, body, content_type, expiry = configatron.cachetastic_caches_page_cache_options.default_expiry)
+        def set_into_cache(url, body, content_type, expiry = Rack::PageCaching::Middleware::Cache.adapter.default_expiry)
           begin
-            Cachetastic::Caches::PageCache.set(Rack::PageCaching::Middleware.generate_key(url), 
+            Rack::PageCaching::Middleware::Cache.set(Rack::PageCaching::Middleware.generate_key(url), 
                                                Rack::PageCaching::Middleware::Page.new(body, content_type),                                        
                                                expiry.to_i)
           rescue Exception => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markbates-rack_page_caching
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: configatron