kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Make sure Inflector.underscore returns a String

Browse source 
If you were to pass it an underscore symbol, it
would be immediately returned without modification.
This commit is contained in:
Jean Boussier 2021-04-08 16:26:39 +02:00
parent 3dd0af563b
commit bade613012
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/lib/active_support/inflector/methods.rb
View file

@ -94,7 +94,7 @@ module ActiveSupport
#
# camelize(underscore('SSLError')) # => "SslError"
def underscore(camel_cased_word)
return camel_cased_word unless /[A-Z-]|::/.match?(camel_cased_word)
return camel_cased_word.to_s unless /[A-Z-]|::/.match?(camel_cased_word)
word = camel_cased_word.to_s.gsub("::", "/")
word.gsub!(inflections.acronyms_underscore_regex) { "#{$1 && '_' }#{$2.downcase}" }
word.gsub!(/([A-Z\d]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << "_" }

3
activesupport/test/inflector_test_cases.rb
View file

@ -120,7 +120,7 @@ module InflectorTestCases
"SpecialGuest" => "special_guest",
"ApplicationController" => "application_controller",
"Area51Controller" => "area51_controller",
"AppCDir" => "app_c_dir"
"AppCDir" => "app_c_dir",
}
UnderscoreToLowerCamel = {
@ -143,6 +143,7 @@ module InflectorTestCases
"FreeBSD" => "free_bsd",
"HTML" => "html",
"ForceXMLController" => "force_xml_controller",
:product => "product",
}
CamelWithModuleToUnderscoreWithSlash = {