Use AS::Concern for caching modules

3 files changed, 24 insertions, 27 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 7fae4e924d..b3fa129929 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -57,13 +57,12 @@ module ActionController #:nodoc:
     end
 
     include ConfigMethods
+    include Pages, Actions, Fragments
+    include Sweeping if defined?(ActiveRecord)
 
     included do
       extend ConfigMethods
 
-      include Pages, Actions, Fragments
-      include Sweeping if defined?(ActiveRecord)
-
       @@perform_caching = true
       cattr_accessor :perform_caching
     end
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 5797eeebd6..36a97d390c 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'uri'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module ActionController #:nodoc:
   module Caching
@@ -34,27 +35,26 @@ module ActionController #:nodoc:
     # Additionally, you can expire caches using Sweepers that act on changes in the model to determine when a cache is supposed to be
     # expired.
     module Pages
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-        base.class_eval do
-          @@page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
-          ##
-          # :singleton-method:
-          # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
-          # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
-          # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
-          # web server to look in the new location for cached files.
-          cattr_accessor :page_cache_directory
-
-          @@page_cache_extension = '.html'
-          ##
-          # :singleton-method:
-          # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
-          # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
-          # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
-          # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
-          cattr_accessor :page_cache_extension
-        end
+      extend ActiveSupport::Concern
+
+      included do
+        @@page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
+        ##
+        # :singleton-method:
+        # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
+        # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
+        # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
+        # web server to look in the new location for cached files.
+        cattr_accessor :page_cache_directory
+
+        @@page_cache_extension = '.html'
+        ##
+        # :singleton-method:
+        # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
+        # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
+        # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
+        # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
+        cattr_accessor :page_cache_extension
       end
 
       module ClassMethods
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 871f41bfdd..cf16417e84 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -30,9 +30,7 @@ module ActionController #:nodoc:
     #     cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
     #   end
     module Sweeping
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods #:nodoc:
         def cache_sweeper(*sweepers)