Changeset 5302

Timestamp:

10/14/06 20:27:29 (2 years ago)

Author:

ulysses

Message:

Rename overlapping test names

Files:

• trunk/activesupport/lib/active_support/dependencies.rb (modified) (5 diffs)
• trunk/activesupport/test/class_inheritable_attributes_test.rb (modified) (1 diff)

trunk/activesupport/lib/active_support/dependencies.rb

@@ -39 +39 @@
-  self.autoloaded_constants = []
-  
+  # An array of constant names that need to be unloaded on every request. Used
+  # to allow arbitrary constants to be marked for unloading.
+  mattr_accessor :explicitly_unloadable_constants
+  self.explicitly_unloadable_constants = []
+  
-  # Set to true to enable logging of const_missing and file loads
-  mattr_accessor :log_activity
@@ -61 +66 @@
-    log_call
-    loaded.clear
-autoloaded
+unloadable
-  end
-
@@ -253 +258 @@
-  end
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  end
-  
@@ -275 +271 @@
-    return false unless qualified_const_defined? name
-    return autoloaded_constants.include?(name)
+  end
+  
+  # Will the provided constant descriptor be unloaded?
+  def will_unload?(const_desc)
+    autoloaded?(desc) ||
+      explicitly_unloadable_constants.include?(const_desc.to_constant_name)
+  end
+  
+  # Mark the provided constant name for unloading. This constant will be
+  # unloaded on each request, not just the next one.
+  def mark_for_unload(const_desc)
+    name = const_desc.to_constant_name
+    unless explicitly_unloadable_constants.include? name
+      explicitly_unloadable_constants << name
+    end
-  end
-  
@@ -299 +310 @@
-      else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
-    end
+  end
+  
+  def remove_constant(const)
+    return false unless qualified_const_defined? const
+    
+    names = const.split('::')
+    if names.size == 1 || names.first.empty? # It's under Object
+      parent = Object
+    else
+      parent = (names[0..-2] * '::').constantize
+    end
+    
+    log "removing constant #{const}"
+    parent.send :remove_const, names.last
+    return true
-  end
-  

trunk/activesupport/test/class_inheritable_attributes_test.rb

@@ -154 +154 @@
-  end
-  
-
+_
-    @klass.class_inheritable_accessor :a
-    @klass.a = {}