aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-12 11:32:45 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-12 16:04:10 -0300
commitc539c684aa0fc08769304746e1702aa1b4ddd4c8 (patch)
tree67dcf16ed3e3d4028c5e2f8c8a9ab136582a95fd
parentc9642e31b1a9f764fbf1ce85b38fa225ec5e6b42 (diff)
downloadrails-c539c684aa0fc08769304746e1702aa1b4ddd4c8.tar.gz
rails-c539c684aa0fc08769304746e1702aa1b4ddd4c8.tar.bz2
rails-c539c684aa0fc08769304746e1702aa1b4ddd4c8.zip
Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup
Fix FileStore#cleanup to no longer rely on missing each_key method Conflicts: activesupport/CHANGELOG.md activesupport/test/caching_test.rb
-rw-r--r--activesupport/CHANGELOG.md4
-rw-r--r--activesupport/lib/active_support/cache/file_store.rb3
-rw-r--r--activesupport/test/caching_test.rb12
3 files changed, 18 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index f410394607..374bca1c85 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,9 @@
## unreleased ##
+* Fix ActiveSupport::Cache::FileStore#cleanup to no longer rely on missing each_key method.
+
+ *Murray Steele*
+
* Add respond_to_missing? for TaggedLogging which is best practice when overriding method_missing. This permits
wrapping TaggedLogging by another log abstraction such as em-logger.
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 9460532af0..c8003650e6 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -29,7 +29,8 @@ module ActiveSupport
def cleanup(options = nil)
options = merged_options(options)
- each_key(options) do |key|
+ search_dir(cache_path) do |fname|
+ key = file_path_key(fname)
entry = read_entry(key, options)
delete_entry(key, options) if entry && entry.expired?
end
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 6db1746672..243648d7f6 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -608,6 +608,18 @@ class FileStoreTest < ActiveSupport::TestCase
ActiveSupport::Cache::FileStore.new('/test/cache/directory').delete_matched(/does_not_exist/)
end
end
+
+ def test_cleanup_removes_all_expired_entries
+ time = Time.now
+ @cache.write('foo', 'bar', expires_in: 10)
+ @cache.write('baz', 'qux')
+ @cache.write('quux', 'corge', expires_in: 20)
+ Time.stubs(:now).returns(time + 15)
+ @cache.cleanup
+ assert !@cache.exist?('foo')
+ assert @cache.exist?('baz')
+ assert @cache.exist?('quux')
+ end
end
class MemoryStoreTest < ActiveSupport::TestCase