TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #4231 from nashby/remove-constantize-ruby-18

Browse Source 
remove ruby 1.8 checking in constantize method
This commit is contained in:
José Valim 2011-12-29 06:00:29 -08:00
commit 0b8b68209d
1 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
activesupport/lib/active_support/inflector/methods.rb
View File

@ -186,9 +186,6 @@ 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")
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:
#
# "Module".constantize # => Module
@ -206,17 +203,6 @@ def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
#
# 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?
@ -227,7 +213,6 @@ def constantize(camel_cased_word) #:nodoc:
end
constant
end
end
# Tries to find a constant with the name specified in the argument string:
#