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

Default precompile regex was erroneously matching files

2 files changed, 10 insertions, 1 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a48db3b6d2..141b39fb4b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -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
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index dfd950aae3..a62ef1e70e 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -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