Changeset 3533
- Timestamp:
- 02/04/06 06:11:42 (3 years ago)
- Files:
-
- trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
- trunk/activerecord/lib/active_record/base.rb (modified) (2 diffs)
- trunk/activesupport/lib/active_support/reloadable.rb (modified) (1 diff)
- trunk/activesupport/test/reloadable_test.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/caching.rb
r3529 r3533 524 524 # ActiveRecord::Observer will mark this class as reloadable even though it should not be. 525 525 # However, subclasses of ActionController::Caching::Sweeper should be Reloadable 526 include Reloadable:: OnlySubclasses526 include Reloadable::Subclasses 527 527 528 528 def before(controller) trunk/activerecord/lib/active_record/base.rb
r3523 r3533 244 244 cattr_accessor :logger 245 245 246 include Reloadable:: OnlySubclasses246 include Reloadable::Subclasses 247 247 248 248 def self.inherited(child) #:nodoc: … … 440 440 else 441 441 object = new(attributes) 442 if scoped?(:create) 443 scope(:create).each { |att,value| object.send("#{att}=", value) } 444 end 442 scope(:create).each { |att,value| object.send("#{att}=", value) } if scoped?(:create) 445 443 object.save 446 444 object trunk/activesupport/lib/active_support/reloadable.rb
r3527 r3533 20 20 # Captures the common pattern where a base class should not be reloaded, 21 21 # but its subclasses should be. 22 module OnlySubclasses22 module Subclasses 23 23 def self.included(base) #nodoc: 24 24 base.send :include, Reloadable trunk/activesupport/test/reloadable_test.rb
r3528 r3533 26 26 end 27 27 28 class OnlySubclassesReloadable29 include Reloadable:: OnlySubclasses28 class SubclassesReloadable 29 include Reloadable::Subclasses 30 30 end 31 class ASubclassOf OnlySubclassesReloadable < OnlySubclassesReloadable31 class ASubclassOfSubclassesReloadable < SubclassesReloadable 32 32 end 33 33 34 34 class AnOnlySubclassReloadableClassSubclassingAReloadableClass 35 include Reloadable:: OnlySubclasses35 include Reloadable::Subclasses 36 36 end 37 37 … … 52 52 53 53 def test_only_subclass_reloadable 54 assert ! ReloadableTestSandbox:: OnlySubclassesReloadable.reloadable?55 assert ReloadableTestSandbox::ASubclassOf OnlySubclassesReloadable.reloadable?54 assert ! ReloadableTestSandbox::SubclassesReloadable.reloadable? 55 assert ReloadableTestSandbox::ASubclassOfSubclassesReloadable.reloadable? 56 56 end 57 57 … … 67 67 AReloadableSubclass 68 68 AClassWhichDefinesItsOwnReloadable 69 ASubclassOf OnlySubclassesReloadable69 ASubclassOfSubclassesReloadable 70 70 ) 71 71 non_reloadables = %w( 72 72 ANonReloadableSubclass 73 OnlySubclassesReloadable73 SubclassesReloadable 74 74 ) 75 75
