diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2011-06-01 01:05:17 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2011-06-01 01:16:20 +0100 |
| commit | cf3364a03c665374f6419a8875474ebf8623ea67 (patch) | |
| tree | 29d501af200663c0367df2c3754f3bacebbd2079 /activesupport/lib/active_support | |
| parent | eb7ef2ccd618bc87451b980722ec73ee41c203a1 (diff) | |
| download | rails-cf3364a03c665374f6419a8875474ebf8623ea67.tar.gz rails-cf3364a03c665374f6419a8875474ebf8623ea67.tar.bz2 rails-cf3364a03c665374f6419a8875474ebf8623ea67.zip | |
Raise NameError instead of ArgumentError in ActiveSupport::Dependencies
ActiveSupport::Dependencies now raises NameError if it finds an existing
constant in load_missing_constant. This better reflects the nature of
the error which is usually caused by calling constantize on a nested constant.
Closes #1423
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index cae68c3c95..26c5c157cb 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -473,7 +473,7 @@ module ActiveSupport #:nodoc: raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!" end - raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name) + raise NameError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name) qualified_name = qualified_name_for from_mod, const_name path_suffix = qualified_name.underscore |