Permalink
Browse files

Added support for naming concrete classes in sweeper declarations [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 40f6763 commit 56d0e33037c602e51c30a6184e64a62def6177e0 @dhh dhh committed Feb 7, 2008
Showing with 11 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +9 −1 actionpack/lib/action_controller/caching/sweeping.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Added support for naming concrete classes in sweeper declarations [DHH]
+
* Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application. #10098 [tpope, kampers]
* Fix typo in form_helper documentation. #10650 [xaviershay, kampers]
@@ -22,6 +22,13 @@ module Caching
# end
#
# In the example above, four actions are cached and three actions are responsible for expiring those caches.
+ #
+ # You can also name an explicit class in the declaration of a sweeper, which is needed if the sweeper is in a module:
+ #
+ # class ListsController < ApplicationController
+ # caches_action :index, :show, :public, :feed
+ # cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
+ # end
module Sweeping
def self.included(base) #:nodoc:
base.extend(ClassMethods)
@@ -31,9 +38,10 @@ module ClassMethods #:nodoc:
def cache_sweeper(*sweepers)
return unless perform_caching
configuration = sweepers.extract_options!
+
sweepers.each do |sweeper|
ActiveRecord::Base.observers << sweeper if defined?(ActiveRecord) and defined?(ActiveRecord::Base)
- sweeper_instance = Object.const_get(Inflector.classify(sweeper)).instance
+ sweeper_instance = (sweeper.is_a?(Symbol) ? Object.const_get(Inflector.classify(sweeper)) : sweeper).instance
if sweeper_instance.is_a?(Sweeper)
around_filter(sweeper_instance, :only => configuration[:only])

0 comments on commit 56d0e33

Please sign in to comment.