Changeset 4910

Timestamp:

09/02/06 21:13:30 (2 years ago)

Author:

ulysses

Message:

Add ApplicationController special case to Dependencies.

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add ApplicationController special case to Dependencies. [Nicholas Seckar]
-
-* Don't pad remaining places with in_groups_of if specified padding value is false. [Marcel Molina Jr.]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -124 +124 @@
-    path = $1 if path =~ /\A(.*)\.rb\Z/
-    expanded_path = File.expand_path(path)
+    
-    bases.collect do |root|
-      expanded_root = File.expand_path root
@@ -132 +133 @@
-      next if nesting.blank?
-      
-
-
+
+
+
+
+
+
+
-  end
-  

trunk/activesupport/test/dependencies_test.rb

@@ -405 +405 @@
-      assert ! Dependencies.autoloaded?(ModuleFolder)
-      
-ModuleFolder::NestedClass
+1 if ModuleFolder::NestedClass # 1 if to avoid warning
-      assert ! Dependencies.autoloaded?(ModuleFolder::NestedClass)
-    end
@@ -413 +413 @@
-  end
-  
+  def test_application_should_special_case_application_controller
+    with_loading 'autoloading_fixtures' do
+      require_dependency 'application'
+      assert_equal 10, ApplicationController
+      assert Dependencies.autoloaded?(:ApplicationController)
+    end
+  end
+  
-end