Fix FileStore cache incorrectly regenerating its key from a pathname …

…when a regexp is used in expire_fragment

[#5850 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>

activesupport/lib/active_support/cache/file_store.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/file/atomic'
 require 'active_support/core_ext/string/conversions'
+require 'rack/utils'
 
 module ActiveSupport
   module Cache
@@ -11,8 +12,6 @@ class FileStore < Store
       attr_reader :cache_path
 
       DIR_FORMATTER = "%03X"
-      ESCAPE_FILENAME_CHARS = /[^a-z0-9_.-]/i
-      UNESCAPE_FILENAME_CHARS = /%[0-9A-F]{2}/
 
       def initialize(cache_path, options = nil)
         super(options)
@@ -136,7 +135,7 @@ def lock_file(file_name, &block) # :nodoc:
 
         # Translate a key into a file path.
         def key_file_path(key)
-          fname = key.to_s.gsub(ESCAPE_FILENAME_CHARS){|match| "%#{match.ord.to_s(16).upcase}"}
+          fname = Rack::Utils.escape(key)
           hash = Zlib.adler32(fname)
           hash, dir_1 = hash.divmod(0x1000)
           dir_2 = hash.modulo(0x1000)
@@ -156,7 +155,7 @@ def key_file_path(key)
         # Translate a file path into a key.
         def file_path_key(path)
           fname = path[cache_path.size, path.size].split(File::SEPARATOR, 4).last
-          fname.gsub(UNESCAPE_FILENAME_CHARS){|match| $1.ord.to_s(16)}
+          Rack::Utils.unescape(fname)
         end
 
         # Delete empty directories in the cache.

activesupport/test/caching_test.rb

@@ -356,9 +356,13 @@ module CacheDeleteMatchedBehavior
   def test_delete_matched
     @cache.write("foo", "bar")
     @cache.write("fu", "baz")
+    @cache.write("foo/bar", "baz")
+    @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
     assert_equal false, @cache.exist?("foo")
     assert_equal true, @cache.exist?("fu")
+    assert_equal false, @cache.exist?("foo/bar")
+    assert_equal true, @cache.exist?("fu/baz")
   end
 end