Changeset 5811

Timestamp:

12/31/06 18:53:58 (2 years ago)

Author:

ulysses

Message:

Fix Dependencies.autoloaded? to ignore anonymous modules. Closes #6561.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (1 diff)
• trunk/activesupport/test/dependencies_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix Dependencies.autoloaded? to ignore anonymous modules. Closes #6561. [Nicholas Seckar]
-
-* Update load once paths to prevent nested once constants from being detected and claimed by an external non-once load. [Nicholas Seckar]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -279 +279 @@
-  # Determine if the given constant has been automatically loaded.
-  def autoloaded?(desc)
+    return false if desc.is_a?(Module) && desc.name.empty? # Empty name => anonymous module.
-    name = to_constant_name desc
-    return false unless qualified_const_defined? name

trunk/activesupport/test/dependencies_test.rb

@@ -305 +305 @@
-      assert Dependencies.autoloaded?("::ModuleFolder")
-      assert Dependencies.autoloaded?(:ModuleFolder)
+
+      assert ! Dependencies.autoloaded?(Module.new)
-
-      Object.send :remove_const, :ModuleFolder
@@ -706 +708 @@
-    with_loading 'autoloading_fixtures' do
-      Dependencies.load_once_paths = Dependencies.load_paths
-
+.to_s
-      assert defined?(A)
-      Dependencies.clear