github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3027 from alex3/assets-precompile-regex-fix

Browse Source 
Default precompile regex was erroneously matching files
This commit is contained in:
Santiago Pastorino
2011-09-21 18:25:40 -07:00
parent 676ddfcf71 6e63e029b3
commit 2bf33bd4bc
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/lib/rails/application/configuration.rb
View File

@@ -38,7 +38,7 @@ module Rails
@assets.enabled = false
@assets.paths = []
@assets.precompile = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
/application.(css|js)$/ ]
/(?:\/|\\|\A)application\.(css|js)$/ ]
@assets.prefix = "/assets"
@assets.version = ''
@assets.debug = false

9
railties/test/application/assets_test.rb
View File

@@ -68,6 +68,10 @@ module ApplicationTests
test "precompile application.js and application.css and all other files not ending with .js or .css by default" do
app_file "app/assets/javascripts/application.js", "alert();"
app_file "app/assets/stylesheets/application.css", "body{}"
app_file "app/assets/javascripts/someapplication.js", "alert();"
app_file "app/assets/stylesheets/someapplication.css", "body{}"
app_file "app/assets/javascripts/something.min.js", "alert();"
app_file "app/assets/stylesheets/something.min.css", "body{}"
@@ -87,8 +91,13 @@ module ApplicationTests
images_should_compile.each do |filename|
assert File.exists?("#{app_path}/public/assets/#{filename}")
end
assert File.exists?("#{app_path}/public/assets/application.js")
assert File.exists?("#{app_path}/public/assets/application.css")
assert !File.exists?("#{app_path}/public/assets/someapplication.js")
assert !File.exists?("#{app_path}/public/assets/someapplication.css")
assert !File.exists?("#{app_path}/public/assets/something.min.js")
assert !File.exists?("#{app_path}/public/assets/something.min.css")
end