aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-13 12:15:49 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-13 12:25:54 -0800
commit9acc824d96db039486fc493c6f904035fe386967 (patch)
tree5b999c536875abb8ba1177c83e7b9da78b10841b /activesupport/lib/active_support/core_ext
parent0214d337b3b3301f4e1478248b386d43ca6c15e0 (diff)
downloadrails-9acc824d96db039486fc493c6f904035fe386967.tar.gz
rails-9acc824d96db039486fc493c6f904035fe386967.tar.bz2
rails-9acc824d96db039486fc493c6f904035fe386967.zip
Ruby 1.9.2: disallow explicit coercion via method_missing. Only give friendly nil errors for Array and Active Record methods.
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-rw-r--r--activesupport/lib/active_support/core_ext/name_error.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/name_error.rb b/activesupport/lib/active_support/core_ext/name_error.rb
index cd165626c8..e1ebd4f91c 100644
--- a/activesupport/lib/active_support/core_ext/name_error.rb
+++ b/activesupport/lib/active_support/core_ext/name_error.rb
@@ -1,7 +1,9 @@
class NameError
# Extract the name of the missing constant from the exception message.
def missing_name
- $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+ if /undefined local variable or method/ !~ message
+ $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+ end
end
# Was this exception raised because the given name was missing?