diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-12 00:23:07 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-12 00:23:07 +0200 |
| commit | d1575ae1b9658c91145d6a46ec2a144a5a089207 (patch) | |
| tree | d630cd4ba2cd512c3be56e33d4e7b45e0cf8fff4 /activesupport/lib/active_support/cache/file_store.rb | |
| parent | 5918b868b24ff384365d436367611aea577f3723 (diff) | |
| download | rails-d1575ae1b9658c91145d6a46ec2a144a5a089207.tar.gz rails-d1575ae1b9658c91145d6a46ec2a144a5a089207.tar.bz2 rails-d1575ae1b9658c91145d6a46ec2a144a5a089207.zip | |
Change Object#either? to Object#among? -- thanks to @jamesarosen for the suggestion!
Diffstat (limited to 'activesupport/lib/active_support/cache/file_store.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache/file_store.rb | 4 |
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 5eeb17efd5..bdef47a237 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.either?('.', '..')} + root_dirs = Dir.entries(cache_path).reject{|f| f.among?('.', '..')} 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.either?('.', '..')}.empty? + if Dir.entries(dir).reject{|f| f.among?('.', '..')}.empty? File.delete(dir) rescue nil delete_empty_directories(File.dirname(dir)) end |