Revert "Make constantize look into ancestors"

[#410 state:open]

This reverts commit 262fef7ed57520b857605a0105fe7ba9265654f6.
This commit is contained in:
Jeremy Kemper 2008-12-15 18:20:18 -08:00
parent 0d48408dcc
commit 19be3d35b3
2 changed files with 41 additions and 39 deletions

@ -330,6 +330,9 @@ def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id") underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
end end
# Ruby 1.9 introduces an inherit argument for Module#const_get and
# #const_defined? and changes their default behavior.
if Module.method(:const_get).arity == 1
# Tries to find a constant with the name specified in the argument string: # Tries to find a constant with the name specified in the argument string:
# #
# "Module".constantize # => Module # "Module".constantize # => Module
@ -352,9 +355,23 @@ def constantize(camel_cased_word)
names.shift if names.empty? || names.first.empty? names.shift if names.empty? || names.first.empty?
constant = Object constant = Object
names.each { |name| constant = constant.const_get(name) } names.each do |name|
constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
end
constant constant
end end
else
def constantize(camel_cased_word) #:nodoc:
names = camel_cased_word.split('::')
names.shift if names.empty? || names.first.empty?
constant = Object
names.each do |name|
constant = constant.const_get(name, false) || constant.const_missing(name)
end
constant
end
end
# Turns a number into an ordinal string used to denote the position in an # Turns a number into an ordinal string used to denote the position in an
# ordered sequence such as 1st, 2nd, 3rd, 4th. # ordered sequence such as 1st, 2nd, 3rd, 4th.

@ -2,21 +2,8 @@
require 'inflector_test_cases' require 'inflector_test_cases'
module Ace module Ace
module Extension
def self.included(base)
base.extend(ClassMethods)
end
module ClassMethods
def mission_accomplished?
false
end
end
end
module Base module Base
class Case class Case
include Extension
end end
end end
end end
@ -180,9 +167,7 @@ def test_constantize
end end
def test_constantize_does_lexical_lookup def test_constantize_does_lexical_lookup
assert_equal InflectorTest, ActiveSupport::Inflector.constantize("Ace::Base::InflectorTest") assert_raises(NameError) { ActiveSupport::Inflector.constantize("Ace::Base::InflectorTest") }
assert_nothing_raised { Ace::Base::Case::ClassMethods }
assert_nothing_raised { assert_equal Ace::Base::Case::ClassMethods, ActiveSupport::Inflector.constantize("Ace::Base::Case::ClassMethods") }
end end
def test_ordinal def test_ordinal