diff options
| author | Alex Tambellini <atambellini@gmail.com> | 2012-01-26 14:19:49 -0500 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-26 20:52:51 +0100 |
| commit | 6c367a0d787705746f262d0bd5ad8c4f13a8c809 (patch) | |
| tree | 9c633afd45ae0e7988ebc536fded126f30570589 /activesupport/lib/active_support | |
| parent | 70cbb1c1cd40ec3a6f48b93a0608b1421965768a (diff) | |
| download | rails-6c367a0d787705746f262d0bd5ad8c4f13a8c809.tar.gz rails-6c367a0d787705746f262d0bd5ad8c4f13a8c809.tar.bz2 rails-6c367a0d787705746f262d0bd5ad8c4f13a8c809.zip | |
safe_constantize should handle wrong constant name NameErrors Fixes #4710
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/inflector/methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb index 1dc2e0487f..f47dfba4b0 100644 --- a/activesupport/lib/active_support/inflector/methods.rb +++ b/activesupport/lib/active_support/inflector/methods.rb @@ -258,7 +258,7 @@ module ActiveSupport begin constantize(camel_cased_word) rescue NameError => e - raise unless e.message =~ /uninitialized constant #{const_regexp(camel_cased_word)}$/ || + raise unless e.message =~ /(uninitialized constant|wrong constant name) #{const_regexp(camel_cased_word)}$/ || e.name.to_s == camel_cased_word.to_s rescue ArgumentError => e raise unless e.message =~ /not missing constant #{const_regexp(camel_cased_word)}\!$/ |