Changeset 1331

Timestamp:

05/19/05 19:17:08 (3 years ago)

Author:

david

Message:

Fixed Dependencies so all modules are able to load missing constants #1173 [Nicholas Seckar]

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed Dependencies so all modules are able to load missing constants #1173 [Nicholas Seckar]
-
-* Fixed the Inflector to underscore strings containing numbers, so Area51Controller becomes area51_controller #1176 [Nicholas Seckar]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -168 +168 @@
-Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) } unless Object.respond_to?(:require_association)
-
+class Module #:nodoc:
+  # Use const_missing to autoload associations so we don't have to
+  # require_association when using single-table inheritance.
+  def const_missing(class_id)
+    if Object.const_defined?(:Controllers) and Object::Controllers.const_available?(class_id)
+      return Object::Controllers.const_get(class_id)
+    end
+    
+    begin
+      require_dependency(class_id.to_s.demodulize.underscore)
+      if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
+    rescue LoadError => e
+      raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
+    end
+  end
+end
+
-class Object #:nodoc:
-  class << self
-    # Use const_missing to autoload associations so we don't have to
-    # require_association when using single-table inheritance.
-    def const_missing(class_id)
-      if Object.const_defined?(:Controllers) and Object::Controllers.const_available?(class_id)
-        return Object::Controllers.const_get(class_id)
-      end
-
-      begin
-        require_dependency(class_id.to_s.demodulize.underscore)
-        if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
-      rescue LoadError => e
-        raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
-      end
-    end
-  end
-
-  def load(file, *extras)
-    begin super(file, *extras)