Changeset 3521

Timestamp:

02/02/06 05:41:00 (3 years ago)

Author:

ulysses

Message:

Add Reloadable::OnlySubclasses which handles the common case where a base class should not be reloaded, but its subclasses should be.

Files:

• trunk/actionmailer/lib/action_mailer/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/observer.rb (modified) (1 diff)
• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/reloadable.rb (modified) (1 diff)
• trunk/activesupport/test/reloadable_test.rb (modified) (2 diffs)

trunk/actionmailer/lib/action_mailer/base.rb

@@ -124 +124 @@
-    # Action Mailer subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-
-
-
-
-
+
+
-    private_class_method :new #:nodoc:
-

trunk/actionpack/lib/action_controller/base.rb

@@ -225 +225 @@
-  class Base
-    DEFAULT_RENDER_STATUS_CODE = "200 OK"
-
-
-
-
-
-
-
-
+
+
+
-    # Determines whether the view has access to controller internals @request, @response, @session, and @template.
-    # By default, it does.

trunk/actionpack/lib/action_controller/caching.rb

@@ -524 +524 @@
-        # ActiveRecord::Observer will mark this class as reloadable even though it should not be.
-        # However, subclasses of ActionController::Caching::Sweeper should be Reloadable
-
-
-
-
+
+
-        def before(controller)
-          self.controller = controller

trunk/activerecord/lib/active_record/base.rb

@@ -243 +243 @@
-    # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+.
-    cattr_accessor :logger
-
+
+
+
-    def self.inherited(child) #:nodoc:
-      child.send :include, Reloadable
-      @@subclasses[self] ||= []
-      @@subclasses[self] << child

trunk/activerecord/lib/active_record/observer.rb

@@ -84 +84 @@
-    # Observer subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-
-
-
-
-
+
+
-    # Attaches the observer to the supplied model classes.
-    def self.observe(*models)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add Reloadable::OnlySubclasses which handles the common case where a base class should not be reloaded, but its subclasses should be. [Nicholas Seckar]
-
-* Further improvements to reloading code [Nicholas Seckar, Trevor Squires]

trunk/activesupport/lib/active_support/reloadable.rb

@@ -15 +15 @@
-    end
-  end
+  
+  module OnlySubclasses
+    class << self
+      def included(base) #nodoc:
+        base.send :include, Reloadable
+        (class << base; self; end;).class_eval do
+          define_method(:reloadable?) { self != base }
+        end
+      end
+    end
+  end
-end

trunk/activesupport/test/reloadable_test.rb

@@ -28 +28 @@
-    include Reloadable
-  end
+  
+  class OnlySubclassesReloadable
+    include Reloadable::OnlySubclasses
+  end
+  class ASubclassOfOnlySubclassesReloadable < OnlySubclassesReloadable
+  end
+  
+  class AnOnlySubclassReloadableClassSubclassingAReloadableClass
+    include Reloadable::OnlySubclasses
+  end
+  
+  class ASubclassofAOnlySubclassReloadableClassWhichWasSubclassingAReloadableClass < AnOnlySubclassReloadableClassSubclassingAReloadableClass
+  end
-end
-
@@ -44 +57 @@
-  end
-  
+  def test_only_subclass_reloadable
+    assert ! ReloadableTestSandbox::OnlySubclassesReloadable.reloadable?
+    assert ReloadableTestSandbox::ASubclassOfOnlySubclassesReloadable.reloadable?
+  end
+  
+  def test_inside_hierarchy_only_subclass_reloadable
+    assert ! ReloadableTestSandbox::AnOnlySubclassReloadableClassSubclassingAReloadableClass.reloadable?
+    assert ReloadableTestSandbox::ASubclassofAOnlySubclassReloadableClassWhichWasSubclassingAReloadableClass.reloadable?
+  end
+  
-  def test_removable_classes
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    results = Reloadable.reloadable_classes