Changeset 4769

Timestamp:

08/16/06 09:18:17 (2 years ago)

Author:

bitsweat

Message:

Dependencies can autoload directories of nested classes.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (1 diff)
• trunk/activesupport/test/autoloading_fixtures/class_folder (added)
• trunk/activesupport/test/autoloading_fixtures/class_folder.rb (added)
• trunk/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb (added)
• trunk/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb (added)
• trunk/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb (added)
• trunk/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb (modified) (1 diff)
• trunk/activesupport/test/dependencies_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Dependencies can autoload directories of nested classes. [Jeremy Kemper]
+    Example:
+      invoice.rb            class Invoice
+      invoice/lineitem.rb   class Invoice::Lineitem
-
-* Add Deprecation.silence so that Reloadable does not scold itself. [Nicholas Seckar]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -283 +283 @@
-    else
-      begin
-
+
+
+
+
+
-      rescue NameError => e
-        # Make sure that the name we are missing is the one that caused the error

trunk/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb

@@ -1 @@
-
+
+
+
-end

trunk/activesupport/test/dependencies_test.rb

@@ -126 +126 @@
-  end
-
-should_manifest_as_modules
+manifest_as_modules_unless_const_defined
-    with_loading 'autoloading_fixtures' do
-      assert_kind_of Module, ModuleFolder
@@ -133 +133 @@
-  end
-
-nested_class_acce
+module_with_nested_cla
-    with_loading 'autoloading_fixtures' do
-      assert_kind_of Class, ModuleFolder::NestedClass
-      Object.send :remove_const, :ModuleFolder
+    end
+  end
+
+  def test_module_with_nested_inline_class
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Class, ModuleFolder::InlineClass
+      Object.send :remove_const, :ModuleFolder
+    end
+  end
+
+  def test_directories_may_manifest_as_nested_classes
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Class, ClassFolder
+      Object.send :remove_const, :ClassFolder
+    end
+  end
+
+  def test_class_with_nested_class
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Class, ClassFolder::NestedClass
+      Object.send :remove_const, :ClassFolder
+    end
+  end
+
+  def test_class_with_nested_inline_class
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Class, ClassFolder::InlineClass
+      Object.send :remove_const, :ClassFolder
-    end
-  end