Changeset 8819

Timestamp:

02/07/08 22:50:49 (7 months ago)

Author:

david

Message:

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

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching/sweeping.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_controller/caching/sweeping.rb

@@ -23 +23 @@
-    #
-    # 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:
@@ -32 +39 @@
-          return unless perform_caching
-          configuration = sweepers.extract_options!
+
-          sweepers.each do |sweeper|
-            ActiveRecord::Base.observers << sweeper if defined?(ActiveRecord) and defined?(ActiveRecord::Base)
-Object.const_get(Inflector.classify(sweeper)
+(sweeper.is_a?(Symbol) ? Object.const_get(Inflector.classify(sweeper)) : sweeper
-
-            if sweeper_instance.is_a?(Sweeper)