Changeset 7128
- Timestamp:
- 06/26/07 20:45:41 (1 year ago)
- Files:
-
- trunk/actionpack/CHANGELOG (modified) (1 diff)
- trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
- trunk/activerecord/lib/active_record/observer.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/CHANGELOG
r7126 r7128 1 1 *SVN* 2 3 * Allow sweepers to be created solely for expiring after controller actions, not model changes [DHH] 4 5 * Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller [DHH] 2 6 3 7 * Give the legacy X-POST_DATA_FORMAT header greater precedence during params parsing for backward compatibility. [Jeremy Kemper] trunk/actionpack/lib/action_controller/caching.rb
r6970 r7128 637 637 end 638 638 639 # Retrieve instance variables set in the controller. 640 def assigns(key) 641 controller.instance_variable_get("@#{key}") 642 end 643 639 644 private 640 645 def callback(timing) trunk/activerecord/lib/active_record/observer.rb
r5211 r7128 141 141 # assert_equal [Person], PersonObserver.observed_class 142 142 def observed_class 143 name.scan(/(.*)Observer/)[0][0].constantize 143 if observed_class_name = name.scan(/(.*)Observer/)[0] 144 observed_class_name[0].constantize 145 else 146 nil 147 end 144 148 end 145 149 end … … 164 168 protected 165 169 def observed_classes 166 Set.new([self.class.observed_class]. flatten)170 Set.new([self.class.observed_class].compact.flatten) 167 171 end 168 172 169 173 def observed_subclasses 170 observed_classes. sum(&:subclasses)174 observed_classes.collect(&:subclasses).flatten 171 175 end 172 176
