Changeset 6426

Timestamp:

03/14/07 23:27:28 (2 years ago)

Author:

ulysses

Message:

Update Dependencies to ignore constants inherited from ancestors. Closes #6951.

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update Dependencies to ignore constants inherited from ancestors. Closes #6951. [Nicholas Seckar]
-
-* Array#to_query preserves its ordering.  #7756 [Greg Spurrier]

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

@@ -19 +19 @@
-    parents
-  end
+  
+  # Return the constants that have been defined locally by this object and not
+  # in an ancestor. This method may miss some constants if their definition in
+  # the ancestor is identical to their definition in the receiver.
+  def local_constants
+    inherited = {}
+    ancestors.each do |anc|
+      next if anc == self
+      anc.constants.each { |const| inherited[const] = anc.const_get(const) }
+    end
+    constants.select do |const|
+      ! inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
+    end
+  end
-end

trunk/activesupport/lib/active_support/dependencies.rb

@@ -319 +319 @@
-      if desc.is_a? Module
-        mod_name = desc.name
-
+local_
-      elsif desc.is_a?(String) || desc.is_a?(Symbol)
-        mod_name = desc.to_s
@@ -325 +325 @@
-        # Handle the case where the module has yet to be defined.
-        initial_constants = if qualified_const_defined?(mod_name)
-
+local_
-        else
-         []
@@ -350 +350 @@
-        mod = mod_name.constantize
-        next [] unless mod.is_a? Module
-
+local_
-        
-        # Make sure no other frames takes credit for these constants.

trunk/activesupport/test/core_ext/module_test.rb

@@ -2 +2 @@
-
-module One
+  Constant1 = "Hello World"
+  Constant2 = "What's up?"
-end
-
-class Ab
-  include One
+  Constant1 = "Hello World" # Will have different object id than One::Constant1
+  Constant3 = "Goodbye World"
-end
-
@@ -91 +95 @@
-    assert_equal [Yz::Zy, Yz, Object], Yz::Zy::Cd.parents
-    assert_equal [Yz, Object], Yz::Zy.parents
+  end
+  
+  def test_local_constants
+    assert_equal %w(Constant1 Constant3), Ab.local_constants.sort
-  end
-

trunk/activesupport/test/dependencies_test.rb

@@ -8 +8 @@
-    name
-  end
+end
+
+module ModuleWithConstant
+  InheritedConstant = "Hello"
-end
-
@@ -573 +577 @@
-  ensure
-    Object.send :remove_const, :M rescue nil
+  end
+
+  def test_new_constants_in_with_inherited_constants
+    m = Dependencies.new_constants_in(:Object) do
+      Object.send :include, ModuleWithConstant
+    end
+    assert_equal [], m
-  end
-