diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-30 09:46:35 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-30 09:46:35 -0800 |
| commit | be99f0c7eb4734011b9ee435bb5ac4a0b916a065 (patch) | |
| tree | 6fa8f77a25b7ba60428267ee1c6330fd602e23d5 /activesupport/lib/active_support/dependencies.rb | |
| parent | 45dad592e47944704ab6951351b2fa29d4a2385f (diff) | |
| download | rails-be99f0c7eb4734011b9ee435bb5ac4a0b916a065.tar.gz rails-be99f0c7eb4734011b9ee435bb5ac4a0b916a065.tar.bz2 rails-be99f0c7eb4734011b9ee435bb5ac4a0b916a065.zip | |
Revert "avoid hundreds of thousands of calls to (Symbol|String)#to_s"
Test coverage isn't comprehensive enough to catch what this breaks. :(
This reverts commit 45dad592e47944704ab6951351b2fa29d4a2385f.
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index cdd2664418..1372e71a61 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -95,7 +95,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.local_constant_names - original_constants # self[namespace] returns an Array of the constants that are being evaluated # for that namespace. For instance, if parent.rb requires child.rb, the first @@ -123,7 +123,7 @@ module ActiveSupport #:nodoc: 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).local_constant_names : [] watching << module_name self[module_name] << original_constants |