From 2ed4363b79e18d1204b608ba23e94411f3a76aa8 Mon Sep 17 00:00:00 2001 From: Tieg Zaharia Date: Fri, 12 Jul 2013 16:43:15 -0400 Subject: [PATCH] remove Concern from Sweeping and extend it manually --- lib/rails/observers/action_controller/caching.rb | 2 +- lib/rails/observers/action_controller/caching/sweeping.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/rails/observers/action_controller/caching.rb b/lib/rails/observers/action_controller/caching.rb index 8e2786d..ef0d2db 100644 --- 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 index 203c4e2..2d6ab9d 100644 --- 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!