aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2016-03-31 02:11:19 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2016-03-31 19:52:10 +0300
commitf2489f493b794ee83a86e746b6240031acb8994e (patch)
tree2cf9a32c4e351373ff68e526ba8c042dbf8e29b4 /activesupport/lib
parenta564fecbd0c96815664067b727817045459cae98 (diff)
downloadrails-f2489f493b794ee83a86e746b6240031acb8994e.tar.gz
rails-f2489f493b794ee83a86e746b6240031acb8994e.tar.bz2
rails-f2489f493b794ee83a86e746b6240031acb8994e.zip
Fix method String#upcase_first
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/string/inflections.rb4
-rw-r--r--activesupport/lib/active_support/inflector/methods.rb6
2 files changed, 7 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index f301eeac43..7277f51076 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -224,7 +224,9 @@ class String
# Converts just the first character to uppercase.
#
- # 'what a Lovely Day'.upcase_first # => "What a Lovely Day"
+ # 'what a Lovely Day'.upcase_first # => "What a Lovely Day"
+ # 'w'.upcase_first # => "W"
+ # ''.upcase_first # => ""
def upcase_first
ActiveSupport::Inflector.upcase_first(self)
end
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 3fbc19ddf8..f94e12e14f 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -142,9 +142,11 @@ module ActiveSupport
# Converts just the first character to uppercase.
#
- # 'what a Lovely Day'.upcase_first # => "What a Lovely Day"
+ # upcase_first('what a Lovely Day') # => "What a Lovely Day"
+ # upcase_first('w') # => "W"
+ # upcase_first('') # => ""
def upcase_first(string)
- string[0].upcase.concat(string[1..-1])
+ string.length > 0 ? string[0].upcase.concat(string[1..-1]) : ''
end
# Capitalizes all the words and replaces some characters in the string to