mongrel_page_cache_handler 1.6.7 → 1.6.9

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.7
+version: 1.6.9

data/lib/utils.rb

@@ -19,56 +19,61 @@ module Mongrel
           end
         end
 
-        def build_full_file_path(request, mk_dirs = false)
-          File.join(build_directory_path(request, mk_dirs), build_file_name(request))
-        end
-
-        def build_directory_path(request, mk_dirs = false)
-          pcd = ActionController::Base.page_cache_directory
-          dir_path = File.join(pcd, build_path(request))
-          FileUtils.mkdir_p(dir_path) if mk_dirs
-          dir_path
-        end
-
-        def build_file_name(request)
-          query_params = build_query_params(request)
-          f_name = ""
-          query_params.each_pair do |key, value|
-            f_name << key.to_s
-            f_name << "_"
-            f_name << value
-            f_name << "-"
-          end
-          f_name.gsub!(" ", "_")
-          f_name.downcase!
-          f_name.chop!
-          f_name
-        end
+        # def build_full_file_path(request, mk_dirs = false)
+        #   File.join(build_directory_path(request, mk_dirs), build_file_name(request))
+        # end
+        # 
+        # def build_directory_path(request, mk_dirs = false)
+        #   pcd = ActionController::Base.page_cache_directory
+        #   dir_path = File.join(pcd, build_path(request))
+        #   FileUtils.mkdir_p(dir_path) if mk_dirs
+        #   dir_path
+        # end
+        # 
+        # def build_file_name(request)
+        #   query_params = build_query_params(request)
+        #   f_name = ""
+        #   query_params.each_pair do |key, value|
+        #     f_name << key.to_s
+        #     f_name << "_"
+        #     f_name << value
+        #     f_name << "-"
+        #   end
+        #   f_name.gsub!(" ", "_")
+        #   f_name.downcase!
+        #   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 == "/" or path.nil? or path == '' # CHANGEME
-            path = "/index"
-          end
+          path = request.params[Mongrel::Const::PATH_INFO].downcase.dup
+          path = "/" if path.blank?
+          path << "?" << request.params["QUERY_STRING"].downcase.dup unless request.params["QUERY_STRING"].blank?
+          path.gsub!(/(gclid=.*?)(&|\z)/, '')
           path
+          # 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 == "/" or path.nil? or path == '' # CHANGEME
+        #     path = "/index"
+        #   end
+        #   path
+        # end
 
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongrel_page_cache_handler
 version: !ruby/object:Gem::Version 
-  version: 1.6.7
+  version: 1.6.9
 platform: ruby
 authors: 
 - markbates
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-31 00:00:00 -05:00
+date: 2008-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: []