diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-06-26 20:45:41 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-06-26 20:45:41 +0000 |
commit | 08d23d5375fef67cb3203dfb5e92f41ae87195ee (patch) | |
tree | 977b5a608052564f609ff7153fe9a3ed52b63e93 /activerecord/lib/active_record | |
parent | a72fe4ea45a94a09a8c31377fad935af6465b700 (diff) | |
download | rails-08d23d5375fef67cb3203dfb5e92f41ae87195ee.tar.gz rails-08d23d5375fef67cb3203dfb5e92f41ae87195ee.tar.bz2 rails-08d23d5375fef67cb3203dfb5e92f41ae87195ee.zip |
Allow sweepers to be created solely for expiring after controller actions, not model changes [DHH] Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7128 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/observer.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb index ace52ef415..29edabc9b1 100644 --- a/activerecord/lib/active_record/observer.rb +++ b/activerecord/lib/active_record/observer.rb @@ -140,7 +140,11 @@ module ActiveRecord # The class observed by default is inferred from the observer's class name: # assert_equal [Person], PersonObserver.observed_class def observed_class - name.scan(/(.*)Observer/)[0][0].constantize + if observed_class_name = name.scan(/(.*)Observer/)[0] + observed_class_name[0].constantize + else + nil + end end end @@ -163,11 +167,11 @@ module ActiveRecord protected def observed_classes - Set.new([self.class.observed_class].flatten) + Set.new([self.class.observed_class].compact.flatten) end def observed_subclasses - observed_classes.sum(&:subclasses) + observed_classes.collect(&:subclasses).flatten end def add_observer!(klass) |