Merge branch 'master' of git://github.com/rails/rails

1 files changed, 19 insertions, 18 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index d784138ebe..b3fa129929 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -40,28 +40,34 @@ module ActionController #:nodoc:
       autoload :Sweeping, 'action_controller/caching/sweeping'
     end
 
-    included do
-      @@cache_store = nil
-      cattr_reader :cache_store
-
-      # Defines the storage option for cached fragments
-      def self.cache_store=(store_option)
-        @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
+    module ConfigMethods
+      def cache_store
+        config.cache_store
       end
 
-      include Pages, Actions, Fragments
-      include Sweeping if defined?(ActiveRecord)
+      def cache_store=(store)
+        config.cache_store = ActiveSupport::Cache.lookup_store(store)
+      end
 
-      @@perform_caching = true
-      cattr_accessor :perform_caching
-    end
+    private
 
-    module ClassMethods
       def cache_configured?
         perform_caching && cache_store
       end
     end
 
+    include ConfigMethods
+    include Pages, Actions, Fragments
+    include Sweeping if defined?(ActiveRecord)
+
+    included do
+      extend ConfigMethods
+
+      @@perform_caching = true
+      cattr_accessor :perform_caching
+    end
+
+
     def caching_allowed?
       request.get? && response.status == 200
     end
@@ -75,10 +81,5 @@ module ActionController #:nodoc:
         yield
       end
     end
-
-  private
-    def cache_configured?
-      self.class.cache_configured?
-    end
   end
 end