From 8f0e0b63f526967fc13c78eedb5c3a28a8f6ee75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 12 Jul 2011 22:30:11 -0300
Subject: [PATCH] assets.cache_store now defaults to filesystem. You will want
 to share tmp/assets_cache between deploys.

---
 actionpack/lib/sprockets/railtie.rb                 |  4 ++--
 railties/lib/rails/application/configuration.rb     | 13 ++-----------
 .../lib/rails/generators/rails/app/app_generator.rb |  3 ++-
 railties/lib/rails/tasks/tmp.rake                   |  3 ++-
 railties/test/application/paths_test.rb             |  1 -
 railties/test/generators/app_generator_test.rb      |  1 +
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index e0124def2b..4906ad9a9c 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -63,8 +63,8 @@ module Sprockets
 
         env.logger = Rails.logger
 
-        if env.respond_to?(:cache)
-          env.cache = assets.cache_store || Rails.cache
+        if env.respond_to?(:cache) && assets.cache_store != false
+          env.cache = ActiveSupport::Cache.lookup_store(assets.cache_store) || Rails.cache
         end
 
         if assets.compress
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 1a29483a73..82caad580d 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -30,6 +30,7 @@ module Rails
         @log_level                   = nil
         @middleware                  = app_middleware
         @generators                  = app_generators
+        @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
 
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled    = false
@@ -37,6 +38,7 @@ module Rails
         @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
         @assets.prefix     = "/assets"
 
+        @assets.cache_store    = [ :file_store, "#{root}/tmp/assets_cache/" ]
         @assets.js_compressor  = nil
         @assets.css_compressor = nil
       end
@@ -70,7 +72,6 @@ module Rails
           paths.add "public/javascripts"
           paths.add "public/stylesheets"
           paths.add "tmp"
-          paths.add "tmp/cache"
           paths
         end
       end
@@ -95,16 +96,6 @@ module Rails
         YAML::load(ERB.new(IO.read(paths["config/database"].first)).result)
       end
 
-      def cache_store
-        @cache_store ||= begin
-          if File.exist?("#{root}/tmp/cache/")
-            [ :file_store, "#{root}/tmp/cache/" ]
-          else
-            :memory_store
-          end
-        end
-      end
-
       def log_level
         @log_level ||= Rails.env.production? ? :info : :debug
       end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 6af9d299aa..72086d5e66 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -117,7 +117,8 @@ module Rails
     end
 
     def tmp
-      empty_directory_with_gitkeep "tmp/cache"
+      empty_directory "tmp/cache"
+      empty_directory "tmp/assets_cache"
     end
 
     def vendor
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 3ee5452475..fd972d5aed 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -4,7 +4,7 @@ namespace :tmp do
 
   desc "Creates tmp directories for sessions, cache, sockets, and pids"
   task :create do
-    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids ))
+    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids tmp/assets_cache ))
   end
 
   namespace :sessions do
@@ -18,6 +18,7 @@ namespace :tmp do
     # desc "Clears all files and directories in tmp/cache"
     task :clear do
       FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
+      FileUtils.rm_rf(Dir['tmp/assets_cache/[^.]*'])
     end
   end
 
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index 0d22d8c19a..964cff48cd 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -48,7 +48,6 @@ module ApplicationTests
       assert_path @paths["vendor"],              "vendor"
       assert_path @paths["vendor/plugins"],      "vendor/plugins"
       assert_path @paths["tmp"],                 "tmp"
-      assert_path @paths["tmp/cache"],           "tmp/cache"
       assert_path @paths["config"],              "config"
       assert_path @paths["config/locales"],      "config/locales/en.yml"
       assert_path @paths["config/environment"],  "config/environment.rb"
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 81f0bf5e82..d1b8f123a0 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -34,6 +34,7 @@ DEFAULT_APP_FILES = %w(
   vendor
   vendor/assets
   vendor/plugins
+  tmp/assets_cache
   tmp/cache
 )