mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4304 from lest/refactor-truncate 

refactor String#truncate not to use mb_chars
This commit is contained in:
Aaron Patterson 2012-01-05 09:23:16 -08:00
parent 351a6009c5 5a7513593f
commit f4ef09c154
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activesupport/lib/active_support/core_ext/string/filters.rb
View File

@ -36,14 +36,13 @@ class String
# "And they found that many people were sleeping better.".truncate(25, :omission => "... (continued)")
# # => "And they f... (continued)"
def truncate(length, options = {})
text = self.dup
return self.dup unless self.length > length
options[:omission] ||= "..."
length_with_room_for_omission = length - options[:omission].mb_chars.length
chars = text.mb_chars
length_with_room_for_omission = length - options[:omission].length
stop = options[:separator] ?
(chars.rindex(options[:separator].mb_chars, length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
(rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
(chars.length > length ? chars[0...stop] + options[:omission] : text).to_s
self[0...stop] + options[:omission]
end
end