Changeset 4729

Timestamp:

08/08/06 21:44:34 (2 years ago)

Author:

ulysses

Message:

Checkin forgotten add. Update const_missing handler to avoid double loading files.

Files:

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

trunk/activesupport/lib/active_support/dependencies.rb

@@ -156 +156 @@
-    
-    file_path = search_for_autoload_file(path_suffix)
-
+&& ! loaded.include?(file_path) #
-      require_or_load file_path, qualified_name
-      raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless from_mod.const_defined?(const_name)

trunk/activesupport/test/dependencies_test.rb

@@ -301 +301 @@
-  end
-  
+  def test_const_missing_should_not_double_load
+    with_loading 'autoloading_fixtures' do
+      require_dependency 'counting_loader'
+      assert_equal 1, $counting_loaded_times
+      ModuleFolder
+      assert_equal 1, $counting_loaded_times
+    end
+  end
+  
-end