Revert "Respect children paths filter settings"

This reverts commit 53778ec. Closes #8146
rails · Nov 9, 2012 · fc5ccd2 · fc5ccd2
1 parent e41d78c
commit fc5ccd2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,7 +1,5 @@
 ## Rails 3.2.9 (unreleased)
 
-*   Don't eager-load app/assets and app/views *Elia Schito*
-
 *   Update supported ruby versions error message in ruby_version_check.rb *Lihan Li*
 
 ## Rails 3.2.8 (Aug 9, 2012) ##

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
@@ -87,15 +87,14 @@ def load_paths
     protected
 
       def filter_by(constraint)
-        yes = []
-        no  = []
-
+        all = []
         all_paths.each do |path|
-          paths = path.existent + path.existent_base_paths
-          path.send(constraint) ? yes.concat(paths) : no.concat(paths)
+          if path.send(constraint)
+            paths  = path.existent
+            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
+            all.concat(paths)
+          end
         end
-
-        all = yes - no
         all.uniq!
         all
       end
@@ -195,10 +194,6 @@ def existent_directories
         expanded.select { |d| File.directory?(d) }
       end
 
-      def existent_base_paths
-        map { |p| File.expand_path(p, @root.path) }.select{ |f| File.exist? f }
-      end
-
       alias to_a expanded
 
       private