Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 15 insertions, 15 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index ffd8081edc..38cf1da6a8 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -24,31 +24,31 @@ module ActionController #:nodoc:
   #   ActionController::Base.cache_store = :mem_cache_store, "localhost"
   #   ActionController::Base.cache_store = MyOwnStore.new("parameter")
   module Caching
+    extend ActiveSupport::Concern
+
     autoload :Actions, 'action_controller/caching/actions'
     autoload :Fragments, 'action_controller/caching/fragments'
     autoload :Pages, 'action_controller/caching/pages'
     autoload :Sweeper, 'action_controller/caching/sweeping'
     autoload :Sweeping, 'action_controller/caching/sweeping'
 
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        @@cache_store = nil
-        cattr_reader :cache_store
+    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)
-        end
+      # Defines the storage option for cached fragments
+      def self.cache_store=(store_option)
+        @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
+      end
 
-        include Pages, Actions, Fragments
-        include Sweeping if defined?(ActiveRecord)
+      include Pages, Actions, Fragments
+      include Sweeping if defined?(ActiveRecord)
 
-        @@perform_caching = true
-        cattr_accessor :perform_caching
+      @@perform_caching = true
+      cattr_accessor :perform_caching
 
-        def self.cache_configured?
-          perform_caching && cache_store
-        end
+      def self.cache_configured?
+        perform_caching && cache_store
       end
     end