Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6044 from gazay/tests_for_string_truncate_w_regex…

…p_separator

Tests for regexp separator in String#truncate
  • Loading branch information...
commit 0b019cc3b821eb362ef3f75f4bc16727c1f23fa6 2 parents 7a80b69 + 0765364
@josevalim josevalim authored
View
5 activesupport/lib/active_support/core_ext/string/filters.rb
@@ -25,11 +25,14 @@ def squish!
# 'Once upon a time in a world far far away'.truncate(27)
# # => "Once upon a time in a wo..."
#
- # Pass a <tt>:separator</tt> to truncate +text+ at a natural break:
+ # Pass a string or regexp <tt>:separator</tt> to truncate +text+ at a natural break:
#
# 'Once upon a time in a world far far away'.truncate(27, :separator => ' ')
# # => "Once upon a time in a..."
#
+ # 'Once upon a time in a world far far away'.truncate(27, :separator => /\s/)
+ # # => "Once upon a time in a..."
+ #
# The last characters will be replaced with the <tt>:omission</tt> string (defaults to "...")
# for a total length not exceeding <tt>:length</tt>:
#
View
6 activesupport/test/core_ext/string_ext_test.rb
@@ -279,6 +279,12 @@ def test_truncate_with_omission_and_seperator
assert_equal "Hello Big[...]", "Hello Big World!".truncate(15, :omission => "[...]", :separator => ' ')
end
+ def test_truncate_with_omission_and_regexp_seperator
+ assert_equal "Hello[...]", "Hello Big World!".truncate(13, :omission => "[...]", :separator => /\s/)
+ assert_equal "Hello Big[...]", "Hello Big World!".truncate(14, :omission => "[...]", :separator => /\s/)
+ assert_equal "Hello Big[...]", "Hello Big World!".truncate(15, :omission => "[...]", :separator => /\s/)
+ end
+
def test_truncate_multibyte
assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
"\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8').truncate(10)
Please sign in to comment.
Something went wrong with that request. Please try again.