aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/engine/configuration.rb2
-rw-r--r--railties/lib/rails/paths.rb22
2 files changed, 18 insertions, 6 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index 2129e10af8..28e7ef947d 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -20,7 +20,7 @@ module Rails
paths.app.models "app/models", :eager_load => true
paths.app.mailers "app/mailers", :eager_load => true
paths.app.metals "app/metal", :eager_load => true
- paths.app.views "app/views", :eager_load => true
+ paths.app.views "app/views"
paths.lib "lib", :load_path => true
paths.lib.tasks "lib/tasks", :glob => "**/*.rake"
paths.config "config"
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 55874813da..1c9e308631 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -3,6 +3,8 @@ require 'set'
module Rails
module Paths
module PathParent
+ attr_reader :children
+
def method_missing(id, *args)
name = id.to_s
@@ -37,15 +39,15 @@ module Rails
end
def load_once
- filter { |path| path.paths if path.load_once? }
+ filter_by(:load_once?)
end
def eager_load
- filter { |path| path.paths if path.eager_load? }
+ filter_by(:eager_load?)
end
def load_paths
- filter { |path| path.paths if path.load_path? }
+ filter_by(:load_path?)
end
def push(*)
@@ -58,8 +60,16 @@ module Rails
protected
- def filter(&block)
- all_paths.map(&block).compact.flatten.uniq.select { |p| File.exists?(p) }
+ def filter_by(constraint)
+ all_paths.map do |path|
+ if path.send(constraint)
+ paths = path.paths
+ paths -= path.children.values.map { |p| p.send(constraint) ? [] : p.paths }.flatten
+ paths
+ else
+ []
+ end
+ end.flatten.uniq.select { |p| File.exists?(p) }
end
end
@@ -129,10 +139,12 @@ module Rails
def paths
raise "You need to set a path root" unless @root.path
+
result = @paths.map do |p|
path = File.expand_path(p, @root.path)
@glob ? Dir[File.join(path, @glob)] : path
end
+
result.flatten!
result.uniq!
result