From 17882d2a9e8e93a5f6dbe2278deb73269fff30c9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 13:50:20 -0300
Subject: [PATCH] Copy assets to nondigested filenames too

---
 actionpack/lib/sprockets/assets.rake     | 14 +++++++++-----
 railties/test/application/assets_test.rb |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 65f0ad4cc8..1e72d29ca2 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -19,10 +19,10 @@ namespace :assets do
       # Ensure that action view is loaded and the appropriate sprockets hooks get executed
       ActionView::Base
 
-      # Always compile files
-      Rails.application.config.assets.compile = true
-
       config = Rails.application.config
+      config.assets.compile = true
+      config.assets.digest = false if ENV["RAILS_ASSETS_NONDIGEST"]
+
       env    = Rails.application.assets
 
       target = File.join(Rails.public_path, config.assets.prefix)
@@ -32,8 +32,12 @@ namespace :assets do
       manifest_path = config.assets.manifest || target
       FileUtils.mkdir_p(manifest_path)
 
-      File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
-        YAML.dump(manifest, f)
+      unless ENV["RAILS_ASSETS_NONDIGEST"]
+        File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
+          YAML.dump(manifest, f)
+        end
+        ENV["RAILS_ASSETS_NONDIGEST"] = "true"
+        ruby $0, *ARGV
       end
     end
   end
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index e9985fa643..12466a3296 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -63,7 +63,9 @@ def precompile!
       precompile!
 
       files = Dir["#{app_path}/public/assets/application-*.js"]
+      files << Dir["#{app_path}/public/assets/application.js"].first
       files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
+      files << Dir["#{app_path}/public/assets/foo/application.js"].first
       files.each do |file|
         assert_not_nil file, "Expected application.js asset to be generated, but none found"
         assert_equal "alert()", File.read(file)
-- 
GitLab