Changeset 4779

Timestamp:

08/16/06 20:54:25 (2 years ago)

Author:

ulysses

Message:

Fix const_missing to behave responsibly when called within anonymous modules

Files:

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

trunk/activesupport/lib/active_support/dependencies.rb

@@ -66 +66 @@
-    # infinite loop with mutual dependencies.
-    loaded << expanded
-
+
-    if load?
-      log "loading #{file_name}"
@@ -179 +179 @@
-  def load_missing_constant(from_mod, const_name)
-    log_call from_mod, const_name
+    
+    # If we have an anonymous module, all we can do is attempt to load from Object.
+    from_mod = Object if from_mod.name.empty?
+    
+    raise ArgumentError, "Expected #{from_mod} is not missing constant #{const_name}!" if from_mod.const_defined?(const_name)
-    
-    qualified_name = qualified_name_for from_mod, const_name

trunk/activesupport/test/dependencies_test.rb

@@ -347 +347 @@
-  
-  def test_const_missing_should_not_double_load
+    $counting_loaded_times = 0
-    with_loading 'autoloading_fixtures' do
-      require_dependency '././counting_loader'
-      assert_equal 1, $counting_loaded_times
-Dependencies.load_missing_constant Object, :CountingLoader
+assert_raises(ArgumentError) { Dependencies.load_missing_constant Object, :CountingLoader }
-      assert_equal 1, $counting_loaded_times
-    end
-  end
-  
+  def test_const_missing_within_anonymous_module
+    $counting_loaded_times = 0
+    m = Module.new
+    m.module_eval "def a() CountingLoader; end"
+    extend m
+    kls = nil    
+    with_loading 'autoloading_fixtures' do
+      kls = nil
+      assert_nothing_raised { kls = a }
+      assert_equal "CountingLoader", kls.name
+      assert_equal 1, $counting_loaded_times
+      
+      assert_nothing_raised { kls = a }
+      assert_equal 1, $counting_loaded_times
+    end
+  end
+  
-end