Changeset 5023

Timestamp:

09/05/06 22:36:28 (2 years ago)

Author:

ulysses

Message:

Equate Kernel.const_missing with Object.const_missing. Fixes #5988.

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*
+
+* Equate Kernel.const_missing with Object.const_missing. Fixes #5988. [Nicholas Seckar]
-
-* Add ApplicationController special case to Dependencies. [Nicholas Seckar]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -207 +207 @@
-  def load_missing_constant(from_mod, const_name)
-    log_call from_mod, const_name
+    if from_mod == Kernel
+      if ::Object.const_defined?(const_name)
+        log "Returning Object::#{const_name} for Kernel::#{const_name}"
+        return ::Object.const_get(const_name)
+      else
+        log "Substituting Object for Kernel"
+        from_mod = Object
+      end
+    end
-    
-    # If we have an anonymous module, all we can do is attempt to load from Object.

trunk/activesupport/test/dependencies_test.rb

@@ -421 +421 @@
-  end
-  
+  def test_const_missing_on_kernel_should_fallback_to_object
+    with_loading 'autoloading_fixtures' do
+      kls = Kernel::E
+      assert_equal "E", kls.name
+      assert_equal kls.object_id, Kernel::E.object_id
+    end
+  end
+  
-end