mongrel_page_cache_handler 1.6.0 → 1.6.1

data/lib/cache_server.rb

@@ -5,11 +5,23 @@ module Mongrel
 
       def process(request, response)
         Mongrel::PageCacheHandler::Utils.do_work(request, response) do
-          file_path = Mongrel::PageCacheHandler::Utils.build_full_file_path(request)
-          if File.exists?(file_path)
-            puts "We found: #{file_path}, let's render it"
-            response.start(200, true) do |head, out|
-              out.write(File.open(file_path).read)
+          case (app_config.page_cache_storage || "disk")
+          when "cachetastic"
+            file_path = Mongrel::PageCacheHandler::Utils.build_cachetastic_key(request)
+            f = Cachetastic::Caches::PageCache.get(file_path)
+            if f
+              puts "We found: #{file_path} in the cache, let's render it"
+              response.start(200, true) do |head, out|
+                out.write(f)
+              end
+            end
+          when "disk"
+            file_path = Mongrel::PageCacheHandler::Utils.build_full_file_path(request)
+            if File.exists?(file_path)
+              puts "We found: #{file_path} on the disk, let's render it"
+              response.start(200, true) do |head, out|
+                out.write(File.open(file_path).read)
+              end
             end
           end
         end

data/lib/cacher.rb

@@ -9,10 +9,18 @@ module Mongrel
             sent = response.header.instance_variable_get("@sent")
             mcm = sent["mongrel_cache_me"]
             if mcm
-              file_path = Mongrel::PageCacheHandler::Utils.build_full_file_path(request, true)
-              puts "Let's cache this page: #{file_path}"
-              File.open(file_path, "w") do |f|
-                f.puts response.body.string
+              case app_config.page_cache_storage
+              when "cachetastic"
+                # file_path = Mongrel::PageCacheHandler::Utils.build_full_file_path(request, true)
+                file_path = Mongrel::PageCacheHandler::Utils.build_cachetastic_key(request)
+                puts "Let's cache this page: #{file_path} to the cache"
+                Cachetastic::Caches::PageCache.set(file_path, response.body.string)
+              when "disk"
+                file_path = Mongrel::PageCacheHandler::Utils.build_full_file_path(request, true)
+                puts "Let's cache this page: #{file_path} to the disk"
+                File.open(file_path, "w") do |f|
+                  f.puts response.body.string
+                end
               end
             end
           end

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: mongrel_page_cache_handler
 package: mongrel_page_cache_handler
 project: magrathea
-version: 1.6.0
+version: 1.6.1

data/lib/utils.rb

@@ -22,29 +22,14 @@ module Mongrel
         end
 
         def build_directory_path(request, mk_dirs = false)
-          path = request.params[Mongrel::Const::PATH_INFO]# + ActionController::Base.page_cache_extension
-          if path == "/"
-            path = "/index"
-          end
           pcd = ActionController::Base.page_cache_directory
-          dir_path = File.join(pcd, path)
+          dir_path = File.join(pcd, build_path(request))
           FileUtils.mkdir_p(dir_path) if mk_dirs
           dir_path
         end
 
         def build_file_name(request)
-          path = request.params[Mongrel::Const::PATH_INFO]
-          path = "/index" if path == "/"
-          url = path 
-          query_string = request.params["QUERY_STRING"]
-          query_params = {:page => "1"}
-          unless query_string.blank?
-            query_string.split("&").sort.each do |pair|
-              pair_values = pair.split("=")
-              query_params[pair_values.first.to_sym] = URI.unescape(pair_values.last)
-            end
-          end
-          query_params.delete(:gclid)
+          query_params = build_query_params(request)
           f_name = ""
           query_params.each_pair do |key, value|
             f_name << key.to_s
@@ -57,6 +42,31 @@ module Mongrel
           f_name.chop!
           f_name
         end
+        
+        def build_cachetastic_key(request)
+          File.join(build_path(request), build_file_name(request))
+        end
+        
+        def build_query_params(request)
+          query_string = request.params["QUERY_STRING"]
+          query_params = {:page => "1"}
+          unless query_string.blank?
+            query_string.split("&").sort.each do |pair|
+              pair_values = pair.split("=")
+              query_params[pair_values.first.to_sym] = URI.unescape(pair_values.last)
+            end
+          end
+          query_params.delete(:gclid)
+          query_params
+        end
+        
+        def build_path(request)
+          path = request.params[Mongrel::Const::PATH_INFO]# + ActionController::Base.page_cache_extension
+          if path == "/"
+            path = "/index"
+          end
+          path
+        end
 
       end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: mongrel_page_cache_handler
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
-date: 2007-10-26 00:00:00 -04:00
+  version: 1.6.1
+date: 2007-12-21 00:00:00 -05:00
 summary: mongrel_page_cache_handler
 require_paths: 
 - lib
@@ -21,6 +21,11 @@ autorequire:
 - m_action_controller_base
 - cacher
 - cache_server
+- utils
+- mongrel_page_cache_handler
+- m_action_controller_base
+- cacher
+- cache_server
 default_executable: 
 bindir: bin
 has_rdoc: false