aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/inflector.rb
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-02-11 18:41:59 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-02-11 18:41:59 +0000
commit91cdd59b12d4101c3dc1130cf0f2b4543a14eb79 (patch)
treea4f8eeb35cf4021cc203c0835412572482f6f090 /activesupport/lib/active_support/inflector.rb
parentb9a9893d2b9bfec83ef2e18cc3103d267369a86a (diff)
downloadrails-91cdd59b12d4101c3dc1130cf0f2b4543a14eb79.tar.gz
rails-91cdd59b12d4101c3dc1130cf0f2b4543a14eb79.tar.bz2
rails-91cdd59b12d4101c3dc1130cf0f2b4543a14eb79.zip
Fix constantize to handle names beginning with '::'. Closes #3803.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/inflector.rb')
-rw-r--r--activesupport/lib/active_support/inflector.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index 2e69b74c54..f91a73c7f3 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/activesupport/lib/active_support/inflector.rb
@@ -143,9 +143,9 @@ module Inflector
def constantize(camel_cased_word)
raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!" unless
- camel_cased_word.split("::").all? { |part| /^[A-Z]\w*$/ =~ part }
+ /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ camel_cased_word
- camel_cased_word = "::#{camel_cased_word}" unless camel_cased_word[0, 2] == '::'
+ camel_cased_word = "::#{camel_cased_word}" unless $1
Object.module_eval(camel_cased_word, __FILE__, __LINE__)
end