let demodulize do less work, and add tests

This is also faster on 1.9.
This commit is contained in:
Xavier Noria 2011-10-29 01:07:54 -07:00
parent 2e74334abd
commit 0fc531392d
2 changed files with 5 additions and 1 deletions

@ -166,7 +166,9 @@ def dasherize(underscored_word)
# "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
# "Inflections".demodulize # => "Inflections"
def demodulize(class_name_in_module)
class_name_in_module.to_s.gsub(/^.*::/, '')
# If you remove the module part of an empty string, you get an empty string.
# That's why the regexp uses the * quantifier.
class_name_in_module.to_s[/[^:]*\z/]
end
# Creates a foreign key name from a class name.

@ -194,6 +194,8 @@ def test_underscore_with_slashes
def test_demodulize
assert_equal "Account", ActiveSupport::Inflector.demodulize("MyApplication::Billing::Account")
assert_equal "Account", ActiveSupport::Inflector.demodulize("Account")
assert_equal "", ActiveSupport::Inflector.demodulize("")
end
def test_foreign_key