Merge branch 'master' of github.com:lifo/docrails

1 files changed, 20 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 53a1c3f160..2acc6ddee5 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -198,12 +198,29 @@ module ActiveSupport
     #
     # NameError is raised when the name is not in CamelCase or the constant is
     # unknown.
-    def constantize(camel_cased_word) #:nodoc:
+    def constantize(camel_cased_word)
       names = camel_cased_word.split('::')
       names.shift if names.empty? || names.first.empty?
 
       names.inject(Object) do |constant, name|
-        constant.const_get(name, false)
+        if constant == Object
+          constant.const_get(name)
+        else
+          candidate = constant.const_get(name)
+          next candidate if constant.const_defined?(name, false)
+          next candidate unless Object.const_defined?(name)
+
+          # Go down the ancestors to check it it's owned
+          # directly before we reach Object or the end of ancestors.
+          constant = constant.ancestors.inject do |const, ancestor|
+            break const    if ancestor == Object
+            break ancestor if ancestor.const_defined?(name, false)
+            const
+          end
+
+          # owner is in Object, so raise
+          constant.const_get(name, false)
+        end
       end
     end
 
@@ -228,6 +245,7 @@ module ActiveSupport
     #   "blargle".safe_constantize  # => nil
     #   "UnknownModule".safe_constantize  # => nil
     #   "UnknownModule::Foo::Bar".safe_constantize  # => nil
+    #
     def safe_constantize(camel_cased_word)
       begin
         constantize(camel_cased_word)