aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache/file_store.rb
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2011-04-13 00:04:40 +0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-04-13 20:25:28 +0800
commit733bfa63f5d8d3b963202b6d3e9f00b4db070b91 (patch)
tree10febe66946c850ce8e6bc0c9560d55d83b7a608 /activesupport/lib/active_support/cache/file_store.rb
parent1f869114f5f671160653eb6f15d2850d82217fe5 (diff)
downloadrails-733bfa63f5d8d3b963202b6d3e9f00b4db070b91.tar.gz
rails-733bfa63f5d8d3b963202b6d3e9f00b4db070b91.tar.bz2
rails-733bfa63f5d8d3b963202b6d3e9f00b4db070b91.zip
Remove `#among?` from Active Support
After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.
Diffstat (limited to 'activesupport/lib/active_support/cache/file_store.rb')
-rw-r--r--activesupport/lib/active_support/cache/file_store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index bdef47a237..9936b33e22 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
end
def clear(options = nil)
- root_dirs = Dir.entries(cache_path).reject{|f| f.among?('.', '..')}
+ root_dirs = Dir.entries(cache_path).reject{|f| f.in?(['.', '..'])}
FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
end
@@ -162,7 +162,7 @@ module ActiveSupport
# Delete empty directories in the cache.
def delete_empty_directories(dir)
return if dir == cache_path
- if Dir.entries(dir).reject{|f| f.among?('.', '..')}.empty?
+ if Dir.entries(dir).reject{|f| f.in?(['.', '..'])}.empty?
File.delete(dir) rescue nil
delete_empty_directories(File.dirname(dir))
end