kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

excerpt() now accepts regular expression instances as phrases.

Browse source
This commit is contained in:
Jan Szumiec 2013-08-07 13:14:28 +01:00 committed by Lucas Mazza
parent 4983734681
commit 2b617783ad
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
actionview/lib/action_view/helpers/text_helper.rb
View file

@ -155,9 +155,13 @@ module ActionView
def excerpt(text, phrase, options = {})
return unless text && phrase
separator = options[:separator] || ''
phrase = Regexp.escape(phrase)
regex = /#{phrase}/i
separator = options.fetch(:separator, nil) || ""
if Regexp === phrase
regex = phrase
else
phrase = Regexp.escape(phrase)
regex = /#{phrase}/i
end
return unless matches = text.match(regex)
phrase = matches[0]

2
actionview/test/template/text_helper_test.rb
View file

@ -264,6 +264,8 @@ class TextHelperTest < ActionView::TestCase
assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", :radius => 5))
assert_equal("This is a...", excerpt("This is a beautiful morning", "this", :radius => 5))
assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", :radius => 5))
assert_equal("...udge Allen and...", excerpt("This day was challenging for judge Allen and his colleagues.", /\ballen\b/i, :radius => 5))
assert_equal("...judge Allen and...", excerpt("This day was challenging for judge Allen and his colleagues.", /\ballen\b/i, :radius => 1, :separator => ' '))
assert_nil excerpt("This is a beautiful morning", "day")
end