diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-01 12:32:17 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:22:27 -0700 |
| commit | f9a69e8744546602b567dc5787f7d8ee23073bec (patch) | |
| tree | e585ccf4976d7a54ab53632f6a881ed4821e95e7 /railties/lib/rails | |
| parent | 05d4b9d2fdb0aceb9082303301ecaf77605288a0 (diff) | |
| download | rails-f9a69e8744546602b567dc5787f7d8ee23073bec.tar.gz rails-f9a69e8744546602b567dc5787f7d8ee23073bec.tar.bz2 rails-f9a69e8744546602b567dc5787f7d8ee23073bec.zip | |
Merge pull request #2324 from zenapsis/3-1-stable
Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/engine.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/paths.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index c41f7d7c2e..2c3f61f404 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -542,9 +542,9 @@ module Rails end initializer :append_assets_path do |app| - app.config.assets.paths.unshift(*paths["vendor/assets"].existent) - app.config.assets.paths.unshift(*paths["lib/assets"].existent) - app.config.assets.paths.unshift(*paths["app/assets"].existent) + app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories) + app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories) + app.config.assets.paths.unshift(*paths["app/assets"].existent_directories) end initializer :prepend_helpers_path do |app| diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index de3d0b6fc5..55b820b12e 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -171,6 +171,10 @@ module Rails def existent expanded.select { |f| File.exists?(f) } end + + def existent_directories + expanded.select {|d| Dir.exists?(d) } + end alias to_a expanded end |