From a143a7c25a8c4bababa2140e6a31f084570aa44d Mon Sep 17 00:00:00 2001
From: Hubert <hubert.lepicki@gmail.com>
Date: Fri, 4 Jun 2010 11:58:59 +0200
Subject: [PATCH] RAILS_CACHE constant removed, replaced with Rails.cache and custom setter for it

---
 actionpack/lib/action_controller/railtie.rb |    4 ++--
 railties/lib/rails.rb                       |    6 +++++-
 railties/lib/rails/application/bootstrap.rb |   10 +++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 0e3cdff..134bbf2 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -57,7 +57,7 @@ module ActionController
     end
 
     initializer "action_controller.initialize_framework_caches" do
-      ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
+      ActiveSupport.on_load(:action_controller) { self.cache_store ||= Rails.cache }
     end
 
     initializer "action_controller.url_helpers" do |app|
@@ -72,4 +72,4 @@ module ActionController
       ActionController::Routing::Routes = proxy
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index be486ef..6bc0534 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -85,7 +85,11 @@ module Rails
     end
 
     def cache
-      RAILS_CACHE
+      @_cache
+    end
+
+    def cache=(cache_store)
+      @_cache = cache_store
     end
 
     def version
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 0a435f0..96dee31 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -43,11 +43,11 @@ module Rails
 
       # Initialize cache early in the stack so railties can make use of it.
       initializer :initialize_cache do
-        unless defined?(RAILS_CACHE)
-          silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(config.cache_store) }
+        unless Rails.cache
+          Rails.cache = ActiveSupport::Cache.lookup_store(config.cache_store) 
 
-          if RAILS_CACHE.respond_to?(:middleware)
-            config.middleware.insert_before("Rack::Runtime", RAILS_CACHE.middleware)
+          if Rails.cache.respond_to?(:middleware)
+            config.middleware.insert_before("Rack::Runtime", Rails.cache.middleware)
           end
         end
       end
@@ -71,4 +71,4 @@ module Rails
       end
     end
   end
-end
\ No newline at end of file
+end
-- 
1.7.0.4