From 31f691329a64b1c4a76d70b035918f1d636818b0 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Fri, 15 Jun 2007 09:18:06 -0500
Subject: [PATCH] Fix Caching Bug Files with "+"s in their names (e.g. from
 Wiki pages with spaces in their names) were not being expired properly. This
 is actually a Rails bug, but I fixed it by patching the action_cache plugin.

---
 .../plugins/action_cache/lib/action_cache.rb  | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/vendor/plugins/action_cache/lib/action_cache.rb b/vendor/plugins/action_cache/lib/action_cache.rb
index 380f6285..6cb65223 100644
--- a/vendor/plugins/action_cache/lib/action_cache.rb
+++ b/vendor/plugins/action_cache/lib/action_cache.rb
@@ -7,6 +7,28 @@ module ActionController
   end
   
   module Caching
+    ##Fix one method which seems to be broken
+    module Fragments
+      def expire_fragment(name, options = nil)
+        return unless perform_caching
+
+        key = fragment_cache_key(name)
+
+        if key.is_a?(Regexp)
+          #need this next line, otherwise filenames with '+'s in them fail
+          key = Regexp.new(Regexp.escape(key.source).gsub(/\\\.\\\*/, '.*'))
+          self.class.benchmark "Expired fragments matching: #{key.source}" do
+            fragment_cache_store.delete_matched(key, options)
+          end
+        else
+          self.class.benchmark "Expired fragment: #{key}" do
+            fragment_cache_store.delete(key, options)
+          end
+        end
+      end
+    end
+    #####
+
     module Actions
 
       # All documentation is keeping DRY in the plugin's README
@@ -134,7 +156,7 @@ module ActionController
             controller.response.headers['Cache-Control'] == 'no-cache'
             controller.response.headers['Cache-Control'] = "max-age=#{controller.response.time_to_live}"
           end
-          controller.response.headers['Etag'] = "\"#{MD5.new(controller.response.body).to_s}\""
+          controller.response.headers['Etag'] = %{"#{MD5.new(controller.response.body).to_s}"}
           controller.response.headers['Last-Modified'] ||= Time.now.httpdate
         end
         
@@ -147,7 +169,7 @@ module ActionController
         
         def send_not_modified(controller)
           controller.logger.info "Send Not Modified"
-          controller.response.headers['Etag'] = "\"#{MD5.new(fragment_body(controller)).to_s}\""
+          controller.response.headers['Etag'] = %{"#{MD5.new(fragment_body(controller)).to_s}"}
           controller.render(:text => "", :status => 304)
         end