Merge pull request #4304 from lest/refactor-truncate

refactor String#truncate not to use mb_chars

1 files changed, 5 insertions, 6 deletions

diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
index d478ee0ef6..1a34e88a87 100644
--- a/activesupport/lib/active_support/core_ext/string/filters.rb
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -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
-    options[:omission] ||= "..."
+    return self.dup unless self.length > length
 
-    length_with_room_for_omission = length - options[:omission].mb_chars.length
-    chars = text.mb_chars
+    options[:omission] ||= "..."
+    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