Merge pull request rails#8 from tiegz/fix_sweeping_mod

Fix the load order issues of Sweeping module
af83 · Jul 18, 2013 · b614184 · b614184
2 parents bbe77bd + 2ed4363
commit b614184
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/rails/observers/action_controller/caching.rb b/lib/rails/observers/action_controller/caching.rb
@@ -7,6 +7,6 @@ module Caching
       autoload :Sweeping, 'rails/observers/action_controller/caching/sweeping'
     end
 
-    include Sweeping if defined?(ActiveRecord)
+    ActionController::Base.extend Sweeping::ClassMethods if defined?(ActiveRecord)
   end
 end
diff --git a/lib/rails/observers/action_controller/caching/sweeping.rb b/lib/rails/observers/action_controller/caching/sweeping.rb
@@ -30,8 +30,6 @@ module Caching
     #     cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
     #   end
     module Sweeping
-      extend ActiveSupport::Concern
-
       module ClassMethods #:nodoc:
         def cache_sweeper(*sweepers)
           configuration = sweepers.extract_options!