@@ -291,11 +291,14 @@ module ActiveSupport # NameError is raised when the name is not in CamelCase or the constant is # unknown. def constantize(camel_cased_word) - unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word - raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!" - end + names = camel_cased_word.split('::') + names.shift if names.empty? || names.first.empty? - Object.module_eval("::#{$1}", __FILE__, __LINE__) + constant = Object + names.each do |name| + constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name) + end + constant end # Turns a number into an ordinal string used to denote the position in an @@ -326,4 +329,4 @@ require 'active_support/inflections' require 'active_support/core_ext/string/inflections' unless String.included_modules.include?(ActiveSupport::CoreExtensions::String::Inflections) String.send :include, ActiveSupport::CoreExtensions::String::Inflections -end \ No newline at end of file +end activesupport/lib/active_support/inflector.rb f5bcbde1e387020c7f4968515921a3ccee3dcda2 Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/ed8a882e47e07b470b71cacd8cd50e251dca4d27 ed8a882e47e07b470b71cacd8cd50e251dca4d27 2008-08-06T17:31:57-07:00 2008-08-06T17:31:57-07:00 JRuby: improve constantize performance. [#410 state:resolved] 0f235c30d417d48189658148760bf3ab0ad43bd0 Jeremy Kemper jeremy@bitsweat.net