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

Fix and simplify highlight regexp

Browse source
This commit is contained in:
Alexey Vakhov 2011-11-10 11:26:42 +04:00
parent a625523e75
commit b5c3987294
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_view/helpers/text_helper.rb
View file

@ -120,7 +120,7 @@ module ActionView
text
else
match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
text.gsub(/(#{match})(?![^<]*?>)/i, options[:highlighter])
end.html_safe
end

4
actionpack/test/template/text_helper_test.rb
View file

@ -194,6 +194,10 @@ class TextHelperTest < ActionView::TestCase
"<p>This is a <strong class=\"highlight\">beautiful</strong> <a href=\"http://example.com/beautiful#top?what=beautiful%20morning&amp;when=now+then\">morning</a>, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
highlight("<p>This is a beautiful <a href=\"http://example.com/beautiful\#top?what=beautiful%20morning&when=now+then\">morning</a>, but also a beautiful day</p>", "beautiful")
)
assert_equal(
"<div>abc <b>div</b></div>",
highlight("<div>abc div</div>", "div", :highlighter => '<b>\1</b>')
)
end
def test_excerpt