Changeset 4780

Timestamp:

08/17/06 03:35:36 (2 years ago)

Author:

ulysses

Message:

Detect missing_constants calls from removed modules and fail accordingly.

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Detect missing_constants calls from removed modules and fail accordingly. [Nicholas Seckar]
-
-* Stop using defined? in Dependencies.qualified_const_defined? since defined? may invoke const_missing. [Nicholas Seckar]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -182 +182 @@
-    # If we have an anonymous module, all we can do is attempt to load from Object.
-    from_mod = Object if from_mod.name.empty?
+    
+    unless qualified_const_defined?(from_mod.name) && from_mod.name.constantize.object_id == from_mod.object_id
+      raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
+    end
-    
-    raise ArgumentError, "Expected #{from_mod} is not missing constant #{const_name}!" if from_mod.const_defined?(const_name)

trunk/activesupport/test/dependencies_test.rb

@@ -373 +373 @@
-  end
-  
+  def test_removal_from_tree_should_be_detected
+    with_loading 'dependencies' do
+      root = Dependencies.autoload_paths.first
+      c = ServiceOne
+      Dependencies.clear
+      assert ! defined?(ServiceOne)
+      begin
+        Dependencies.load_missing_constant(c, :FakeMissing)
+        flunk "Expected exception"
+      rescue ArgumentError => e
+        assert_match %r{ServiceOne has been removed from the module tree}i, e.message
+      end
+    end
+  end
+  
-end