mirror of
https://github.com/github/rails.git
synced 2026-01-30 00:38:00 -05:00
Normalize classify's argument to a String so that it plays nice with Symbols. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4359 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Normalize classify's argument to a String so that it plays nice with Symbols. [Marcel Molina Jr.]
|
||||
|
||||
* Strip out leading schema name in classify. References #5139. [schoenm@earthlink.net]
|
||||
|
||||
* Remove Enumerable#first_match since break(value) handles the use case well enough. [Nicholas Seckar]
|
||||
|
||||
@@ -147,7 +147,7 @@ module Inflector
|
||||
|
||||
def classify(table_name)
|
||||
# strip out any leading schema name
|
||||
camelize(singularize(table_name.sub(/.*\./, '')))
|
||||
camelize(singularize(table_name.to_s.sub(/.*\./, '')))
|
||||
end
|
||||
|
||||
def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
|
||||
|
||||
@@ -278,6 +278,12 @@ class InflectorTest < Test::Unit::TestCase
|
||||
assert_equal(class_name, Inflector.classify(table_name))
|
||||
end
|
||||
end
|
||||
|
||||
def test_classify_with_symbol
|
||||
assert_nothing_raised do
|
||||
assert_equal 'FooBar', Inflector.classify(:foo_bar)
|
||||
end
|
||||
end
|
||||
|
||||
def test_humanize
|
||||
UnderscoreToHuman.each do |underscore, human|
|
||||
|
||||
Reference in New Issue
Block a user