From 2b617783ad37e1f008499ba8389f50d67e7b78b1 Mon Sep 17 00:00:00 2001
From: Jan Szumiec <jan.szumiec@gmail.com>
Date: Wed, 7 Aug 2013 13:14:28 +0100
Subject: excerpt() now accepts regular expression instances as phrases.

---
 actionview/lib/action_view/helpers/text_helper.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'actionview/lib')

diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb
index 7cfbca5b6f..2109b2724c 100644
--- a/actionview/lib/action_view/helpers/text_helper.rb
+++ b/actionview/lib/action_view/helpers/text_helper.rb
@@ -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]
-- 
cgit v1.2.3


From 490f25034d62817f9315084ddc0506ff6bc65055 Mon Sep 17 00:00:00 2001
From: Jan Szumiec <jan.szumiec@gmail.com>
Date: Wed, 7 Aug 2013 13:34:24 +0100
Subject: highlight() now accepts regular expressions as well.

---
 actionview/lib/action_view/helpers/text_helper.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'actionview/lib')

diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb
index 2109b2724c..e860577d6f 100644
--- a/actionview/lib/action_view/helpers/text_helper.rb
+++ b/actionview/lib/action_view/helpers/text_helper.rb
@@ -123,7 +123,9 @@ module ActionView
           text
         else
           highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
-          match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
+          match = Array(phrases).map do |p|
+            Regexp === p ? p.to_s : Regexp.escape(p)
+          end.join('|')
           text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
         end.html_safe
       end
@@ -156,11 +158,11 @@ module ActionView
         return unless text && phrase
 
         separator = options.fetch(:separator, nil) || ""
-        if Regexp === phrase
+        case phrase
+        when Regexp
           regex = phrase
         else
-          phrase    = Regexp.escape(phrase)
-          regex     = /#{phrase}/i
+          regex = /#{Regexp.escape(phrase)}/i
         end
 
         return unless matches = text.match(regex)
-- 
cgit v1.2.3


From 9f27e1076ac6aacb33b0f4ee0e940c2a90f1c630 Mon Sep 17 00:00:00 2001
From: Lucas Mazza <lucastmazza@gmail.com>
Date: Thu, 19 Jun 2014 14:58:36 -0300
Subject: 'TextHelper#highlight' now accepts a block to highlight the matched
 words.

The helper will yield each matched word, and you can use this instead of the
':highlighter' option for more complex replacing logic:

  highlight('My email is me@work.com', EMAIL_REGEXP) { |m| mail_to(m) }
  # => 'My email is <a href="mailto:me@work.com">me@work.com</a>'
---
 actionview/lib/action_view/helpers/text_helper.rb | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'actionview/lib')

diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb
index e860577d6f..cf5c1b0e81 100644
--- a/actionview/lib/action_view/helpers/text_helper.rb
+++ b/actionview/lib/action_view/helpers/text_helper.rb
@@ -103,11 +103,14 @@ module ActionView
       # Highlights one or more +phrases+ everywhere in +text+ by inserting it into
       # a <tt>:highlighter</tt> string. The highlighter can be specialized by passing <tt>:highlighter</tt>
       # as a single-quoted string with <tt>\1</tt> where the phrase is to be inserted (defaults to
-      # '<mark>\1</mark>')
+      # '<mark>\1</mark>') or passing a block that receives each matched term.
       #
       #   highlight('You searched for: rails', 'rails')
       #   # => You searched for: <mark>rails</mark>
       #
+      #   highlight('You searched for: rails', /for|rails/)
+      #   # => You searched <mark>for</mark>: <mark>rails</mark>
+      #
       #   highlight('You searched for: ruby, rails, dhh', 'actionpack')
       #   # => You searched for: ruby, rails, dhh
       #
@@ -116,17 +119,25 @@ module ActionView
       #
       #   highlight('You searched for: rails', 'rails', highlighter: '<a href="search?q=\1">\1</a>')
       #   # => You searched for: <a href="search?q=rails">rails</a>
+      #
+      #   highlight('You searched for: rails', 'rails') { |match| link_to(search_path(q: match, match)) }
+      #   # => You searched for: <a href="search?q=rails">rails</a>
       def highlight(text, phrases, options = {})
         text = sanitize(text) if options.fetch(:sanitize, true)
 
         if text.blank? || phrases.blank?
           text
         else
-          highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
           match = Array(phrases).map do |p|
             Regexp === p ? p.to_s : Regexp.escape(p)
           end.join('|')
-          text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
+
+          if block_given?
+            text.gsub(/(#{match})(?![^<]*?>)/i) { |found| yield found }
+          else
+            highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
+            text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
+          end
         end.html_safe
       end
 
-- 
cgit v1.2.3