Browse files

Merge pull request #3469 from kennyj/dont_use_old_code

Refactor ActiveSupport::Cache::FileStore.
  • Loading branch information...
2 parents 3e6ecfb + 7670a51 commit 818bf1da0e86cf50b5a33ec493959374ccc1cb7d @spastorino spastorino committed Oct 30, 2011
Showing with 4 additions and 3 deletions.
  1. +4 −3 activesupport/lib/active_support/cache/file_store.rb
View
7 activesupport/lib/active_support/cache/file_store.rb
@@ -14,6 +14,7 @@ class FileStore < Store
DIR_FORMATTER = "%03X"
FILENAME_MAX_SIZE = 230 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
+ EXCLUDED_DIRS = ['.', '..'].freeze
def initialize(cache_path, options = nil)
super(options)
@@ -22,7 +23,7 @@ def initialize(cache_path, options = nil)
end
def clear(options = nil)
- root_dirs = Dir.entries(cache_path).reject{|f| f.in?(['.', '..'])}
+ root_dirs = Dir.entries(cache_path).reject{|f| f.in?(EXCLUDED_DIRS)}
FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
end
@@ -149,7 +150,7 @@ def file_path_key(path)
# Delete empty directories in the cache.
def delete_empty_directories(dir)
return if dir == cache_path
- if Dir.entries(dir).reject{|f| f.in?(['.', '..'])}.empty?
+ if Dir.entries(dir).reject{|f| f.in?(EXCLUDED_DIRS)}.empty?
File.delete(dir) rescue nil
delete_empty_directories(File.dirname(dir))
end
@@ -163,7 +164,7 @@ def ensure_cache_path(path)
def search_dir(dir, &callback)
return if !File.exist?(dir)
Dir.foreach(dir) do |d|
- next if d == "." || d == ".."
+ next if d.in?(EXCLUDED_DIRS)
name = File.join(dir, d)
if File.directory?(name)
search_dir(name, &callback)

0 comments on commit 818bf1d

Please sign in to comment.