Permalink
Browse files

Merge pull request #11603 from jetthoughts/join_strings_instead_of_co…

…ntactination

Cleanup: replace String concatenation by joining for excerpt helper

Conflicts:
	actionview/CHANGELOG.md
  • Loading branch information...
1 parent 6a418db commit 58ab79ff9b34c22c3477e29763fdd4f4612e938d @rafaelfranca rafaelfranca committed Sep 12, 2013
@@ -150,7 +150,7 @@ def highlight(text, phrases, options = {})
def excerpt(text, phrase, options = {})
return unless text && phrase
- separator = options.fetch(:separator, "")
+ separator = options[:separator] || ''
phrase = Regexp.escape(phrase)
regex = /#{phrase}/i
@@ -169,7 +169,8 @@ def excerpt(text, phrase, options = {})
prefix, first_part = cut_excerpt_part(:first, first_part, separator, options)
postfix, second_part = cut_excerpt_part(:second, second_part, separator, options)
- prefix + (first_part + separator + phrase + separator + second_part).strip + postfix
+ affix = [first_part, separator, phrase, separator, second_part].join.strip
+ [prefix, affix, postfix].join
end
# Attempts to pluralize the +singular+ word unless +count+ is 1. If
@@ -314,6 +314,9 @@ def test_excerpt_with_separator
options = { :separator => "\n", :radius => 1 }
assert_equal("...very\nvery long\nstring", excerpt("my very\nvery\nvery long\nstring", 'long', options))
+
+ assert_equal excerpt('This is a beautiful morning', 'a'),
+ excerpt('This is a beautiful morning', 'a', separator: nil)
end
def test_word_wrap

0 comments on commit 58ab79f

Please sign in to comment.