Changeset 4060

Timestamp:

03/27/06 05:13:46 (3 years ago)

Author:

ulysses

Message:

Dependencies cleanup. Fixes #4221.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/module.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/module/introspection.rb (added)
• trunk/activesupport/lib/active_support/core_ext/module/loading.rb (added)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (2 diffs)
• trunk/activesupport/test/autoloading_fixtures/module_folder (added)
• trunk/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb (added)
• trunk/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb (added)
• trunk/activesupport/test/core_ext/module_test.rb (modified) (1 diff)
• trunk/activesupport/test/dependencies_test.rb (modified) (3 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* When possible, avoid incorrectly obtaining constants from parent modules. Fixes #4221. [Nicholas Seckar]
+
+* Add more tests for dependencies; refactor existing cases. [Nicholas Seckar]
+
+* Move Module#parent and Module#as_load_path into core_ext. Add Module#parent. [Nicholas Seckar]
-
-* Add CachingTools::HashCaching to simplify the creation of nested, autofilling hashes. [Nicholas Seckar]

trunk/activesupport/lib/active_support/core_ext/module.rb

@@ -2 +2 @@
-require File.dirname(__FILE__) + '/module/attribute_accessors'
-require File.dirname(__FILE__) + '/module/delegation'
+require File.dirname(__FILE__) + '/module/introspection'
+require File.dirname(__FILE__) + '/module/loading'

trunk/activesupport/lib/active_support/dependencies.rb

@@ -79 +79 @@
-  alias :rails_original_const_missing :const_missing
-  
-  def parent
-    parent_name = name.split('::')[0..-2] * '::'
-    parent_name.empty? ? Object : parent_name.constantize
-  end
-  
-  def as_load_path
-    if self == Object || self == Kernel
-      ''
-    elsif is_a? Class
-      parent == self ? '' : parent.as_load_path
-    else
-      name.split('::').collect do |word|
-        word.underscore
-      end * '/'
-    end
-  end
-  
-  # Use const_missing to autoload associations so we don't have to
-  # require_association when using single-table inheritance.
@@ -117 +100 @@
-      end
-      
-
+
+
+
+
+
-        suppress(NameError) do
-          return parent.send(:const_missing, class_id)

trunk/activesupport/test/core_ext/module_test.rb

@@ -83 +83 @@
-    assert_raises(ArgumentError) { eval($noplace) }
-  end
+  
+  def test_parent
+    assert_equal Yz::Zy, Yz::Zy::Cd.parent
+    assert_equal Yz, Yz::Zy.parent
+    assert_equal Object, Yz.parent
+  end
+  
+  def test_parents
+    assert_equal [Yz::Zy, Yz, Object], Yz::Zy::Cd.parents
+    assert_equal [Yz, Object], Yz::Zy.parents
+  end
+  
+  def test_as_load_path
+    assert_equal 'yz/zy', Yz::Zy.as_load_path
+    assert_equal 'yz', Yz.as_load_path
+  end
-end

trunk/activesupport/test/dependencies_test.rb

@@ -7 +7 @@
-  def teardown
-    Dependencies.clear
+  end
+  
+  def with_loading(from_dir = nil)
+    prior_path = $LOAD_PATH.clone
+    $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/#{from_dir}" if from_dir
+    old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load
+    yield
+  ensure
+    $LOAD_PATH.clear
+    $LOAD_PATH.concat prior_path
+    Dependencies.mechanism = old_mechanism
-  end
-
@@ -30 +41 @@
-
-  def test_dependency_which_raises_exception_isnt_added_to_loaded_set
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-      assert !Dependencies.loaded.include?(filename)
-      assert !Dependencies.history.include?(filename)
+
+      silence_warnings { require_dependency filename }
+      assert_equal 1, $check_warnings_load_count
+      assert_equal true, $checked_verbose, 'On first load warnings should be enabled.'
+
+      assert Dependencies.loaded.include?(filename)
+      Dependencies.clear
+      assert !Dependencies.loaded.include?(filename)
+      assert Dependencies.history.include?(filename)
+
+      silence_warnings { require_dependency filename }
+      assert_equal 2, $check_warnings_load_count
+      assert_equal nil, $checked_verbose, 'After first load warnings should be left alone.'
+
+      assert Dependencies.loaded.include?(filename)
+      Dependencies.clear
+      assert !Dependencies.loaded.include?(filename)
+      assert Dependencies.history.include?(filename)
+
+      enable_warnings { require_dependency filename }
+      assert_equal 3, $check_warnings_load_count
+      assert_equal true, $checked_verbose, 'After first load warnings should be left alone.'
+
+      assert Dependencies.loaded.include?(filename)
-    end
-  ensure
-    Dependencies.mechanism = old_mechanism
-  end
-
-  def test_warnings_should_be_enabled_on_first_load
-    old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load
-    old_warnings, Dependencies.warnings_on_first_load = Dependencies.warnings_on_first_load, true
-
-    filename = "#{File.dirname(__FILE__)}/dependencies/check_warnings"
-    $check_warnings_load_count = 0
-
-    assert !Dependencies.loaded.include?(filename)
-    assert !Dependencies.history.include?(filename)
-
-    silence_warnings { require_dependency filename }
-    assert_equal 1, $check_warnings_load_count
-    assert_equal true, $checked_verbose, 'On first load warnings should be enabled.'
-
-    assert Dependencies.loaded.include?(filename)
-    Dependencies.clear
-    assert !Dependencies.loaded.include?(filename)
-    assert Dependencies.history.include?(filename)
-
-    silence_warnings { require_dependency filename }
-    assert_equal 2, $check_warnings_load_count
-    assert_equal nil, $checked_verbose, 'After first load warnings should be left alone.'
-
-    assert Dependencies.loaded.include?(filename)
-    Dependencies.clear
-    assert !Dependencies.loaded.include?(filename)
-    assert Dependencies.history.include?(filename)
-
-    enable_warnings { require_dependency filename }
-    assert_equal 3, $check_warnings_load_count
-    assert_equal true, $checked_verbose, 'After first load warnings should be left alone.'
-
-    assert Dependencies.loaded.include?(filename)
-  ensure
-    Dependencies.mechanism = old_mechanism
-    Dependencies.warnings_on_first_load = old_warnings
-  end
-
-  def test_mutual_dependencies_dont_infinite_loop
-
-
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-  end
-  
@@ -107 +110 @@
-  
-  def test_module_loading
-
-
-
-
+
-      assert_kind_of Module, A
-      assert_kind_of Class, A::B
-      assert_kind_of Class, A::C::D
-      assert_kind_of Class, A::C::E::F
-    ensure
-      $LOAD_PATH.shift
-      Dependencies.mechanism = old_mechanism
-    end
-  end
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    end
-    
-  end
+  
+  def test_directories_should_manifest_as_modules
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Module, ModuleFolder
+      Object.send :remove_const, :ModuleFolder
+    end
+  end
+  
+  def test_nested_class_access
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Class, ModuleFolder::NestedClass
+      Object.send :remove_const, :ModuleFolder
+    end
+  end
+  
+  def test_nested_class_can_access_sibling
+    with_loading 'autoloading_fixtures' do
+      sibling = ModuleFolder::NestedClass.class_eval "NestedSibling"
+      assert defined?(ModuleFolder::NestedSibling)
+      assert_equal ModuleFolder::NestedSibling, sibling
+      Object.send :remove_const, :ModuleFolder
+    end
+  end
+  
+  def failing_test_access_thru_and_upwards_fails
+    with_loading 'autoloading_fixtures' do
+      assert ! defined?(ModuleFolder)
+      assert_raises(NameError) { ModuleFolder::Object }
+      assert_raises(NameError) { ModuleFolder::NestedClass::Object }
+      Object.send :remove_const, :ModuleFolder
+    end
+  end
+  
-end