diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-13 17:53:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 17:53:55 -0500 |
commit | 0b75743e345f98d3f53f5a29fcd0e91d2a370a24 (patch) | |
tree | 1020bed2638cff5df24199fd1b1010adf474d720 /railties/lib | |
parent | 3dea7f0615144e891d4122697638db735fbea71d (diff) | |
parent | cffbf73a4761816d894a49fbec7f070f27ebbff4 (diff) | |
download | rails-0b75743e345f98d3f53f5a29fcd0e91d2a370a24.tar.gz rails-0b75743e345f98d3f53f5a29fcd0e91d2a370a24.tar.bz2 rails-0b75743e345f98d3f53f5a29fcd0e91d2a370a24.zip |
Merge pull request #34400 from gmcgibbon/rm_autoload_app_javascripts
Remove asset paths from autoload_paths
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/engine/configuration.rb | 4 | ||||
-rw-r--r-- | railties/lib/rails/paths.rb | 28 |
2 files changed, 22 insertions, 10 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 6bf0406b21..4143b3c881 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -38,7 +38,9 @@ module Rails @paths ||= begin paths = Rails::Paths::Root.new(@root) - paths.add "app", eager_load: true, glob: "{*,*/concerns}" + paths.add "app", eager_load: true, + glob: "{*,*/concerns}", + exclude: %w(assets javascript) paths.add "app/assets", glob: "*" paths.add "app/controllers", eager_load: true paths.add "app/channels", eager_load: true, glob: "**/*_channel.rb" diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index 87222563fd..8367ac8980 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -113,10 +113,11 @@ module Rails attr_accessor :glob def initialize(root, current, paths, options = {}) - @paths = paths - @current = current - @root = root - @glob = options[:glob] + @paths = paths + @current = current + @root = root + @glob = options[:glob] + @exclude = options[:exclude] options[:autoload_once] ? autoload_once! : skip_autoload_once! options[:eager_load] ? eager_load! : skip_eager_load! @@ -189,13 +190,11 @@ module Rails raise "You need to set a path root" unless @root.path result = [] - each do |p| - path = File.expand_path(p, @root.path) + each do |path| + path = File.expand_path(path, @root.path) if @glob && File.directory?(path) - Dir.chdir(path) do - result.concat(Dir.glob(@glob).map { |file| File.join path, file }.sort) - end + result.concat files_in(path) else result << path end @@ -222,6 +221,17 @@ module Rails end alias to_a expanded + + private + + def files_in(path) + Dir.chdir(path) do + files = Dir.glob(@glob) + files -= @exclude if @exclude + files.map! { |file| File.join(path, file) } + files.sort + end + end end end end |