From 19be3d35b38b6685789d8d343617d465a3652717 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 15 Dec 2008 18:20:18 -0800
Subject: Revert "Make constantize look into ancestors"
[#410 state:open]
This reverts commit 262fef7ed57520b857605a0105fe7ba9265654f6.
---
activesupport/lib/active_support/inflector.rb | 65 +++++++++++++++++----------
activesupport/test/inflector_test.rb | 17 +------
2 files changed, 42 insertions(+), 40 deletions(-)
(limited to 'activesupport')
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index 9fb7540ea2..4921b99677 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/activesupport/lib/active_support/inflector.rb
@@ -330,30 +330,47 @@ module ActiveSupport
underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
end
- # Tries to find a constant with the name specified in the argument string:
- #
- # "Module".constantize # => Module
- # "Test::Unit".constantize # => Test::Unit
- #
- # The name is assumed to be the one of a top-level constant, no matter whether
- # it starts with "::" or not. No lexical context is taken into account:
- #
- # C = 'outside'
- # module M
- # C = 'inside'
- # C # => 'inside'
- # "C".constantize # => 'outside', same as ::C
- # end
- #
- # NameError is raised when the name is not in CamelCase or the constant is
- # unknown.
- def constantize(camel_cased_word)
- names = camel_cased_word.split('::')
- names.shift if names.empty? || names.first.empty?
-
- constant = Object
- names.each { |name| constant = constant.const_get(name) }
- constant
+ # 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:
+ #
+ # "Module".constantize # => Module
+ # "Test::Unit".constantize # => Test::Unit
+ #
+ # The name is assumed to be the one of a top-level constant, no matter whether
+ # it starts with "::" or not. No lexical context is taken into account:
+ #
+ # C = 'outside'
+ # module M
+ # C = 'inside'
+ # C # => 'inside'
+ # "C".constantize # => 'outside', same as ::C
+ # end
+ #
+ # NameError is raised when the name is not in CamelCase or the constant is
+ # unknown.
+ def constantize(camel_cased_word)
+ names = camel_cased_word.split('::')
+ names.shift if names.empty? || names.first.empty?
+
+ constant = Object
+ names.each do |name|
+ constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+ end
+ constant
+ 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
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 2c422ebe72..d8c93dc9ae 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -2,21 +2,8 @@ require 'abstract_unit'
require 'inflector_test_cases'
module Ace
- module Extension
- def self.included(base)
- base.extend(ClassMethods)
- end
-
- module ClassMethods
- def mission_accomplished?
- false
- end
- end
- end
-
module Base
class Case
- include Extension
end
end
end
@@ -180,9 +167,7 @@ class InflectorTest < Test::Unit::TestCase
end
def test_constantize_does_lexical_lookup
- assert_equal InflectorTest, 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") }
+ assert_raises(NameError) { ActiveSupport::Inflector.constantize("Ace::Base::InflectorTest") }
end
def test_ordinal
--
cgit v1.2.3