aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/dependencies.rb
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2016-02-28 11:00:14 +0900
committeryui-knk <spiketeika@gmail.com>2016-03-01 20:34:37 +0900
commit86d4e189580e84c4b7effc0c3ebd25b4e8dc4fee (patch)
treee13148aa3d71f77277afbf29f4cf2949800cde09 /activesupport/lib/active_support/dependencies.rb
parent0d37f122fc0b697c25d1c31a5a9c310c4328e034 (diff)
downloadrails-86d4e189580e84c4b7effc0c3ebd25b4e8dc4fee.tar.gz
rails-86d4e189580e84c4b7effc0c3ebd25b4e8dc4fee.tar.bz2
rails-86d4e189580e84c4b7effc0c3ebd25b4e8dc4fee.zip
Deprecate `Module.local_constants`
After Ruby 1.9, we can easily get the constants that have been defined locally by `Module.constants(false)`.
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
-rw-r--r--activesupport/lib/active_support/dependencies.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index fd9fbff96a..0da01b0fe8 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -143,7 +143,7 @@ module ActiveSupport #:nodoc:
next unless mod.is_a?(Module)
# Get a list of the constants that were added
- new_constants = mod.local_constants - original_constants
+ new_constants = mod.constants(false) - original_constants
# @stack[namespace] returns an Array of the constants that are being evaluated
# for that namespace. For instance, if parent.rb requires child.rb, the first
@@ -171,7 +171,7 @@ module ActiveSupport #:nodoc:
@watching << namespaces.map do |namespace|
module_name = Dependencies.to_constant_name(namespace)
original_constants = Dependencies.qualified_const_defined?(module_name) ?
- Inflector.constantize(module_name).local_constants : []
+ Inflector.constantize(module_name).constants(false) : []
@stack[module_name] << original_constants
module_name