diff options
| author | Jan Szumiec <jan.szumiec@gmail.com> | 2013-08-07 13:14:28 +0100 |
|---|---|---|
| committer | Lucas Mazza <lucastmazza@gmail.com> | 2014-06-19 14:44:59 -0300 |
| commit | 2b617783ad37e1f008499ba8389f50d67e7b78b1 (patch) | |
| tree | 85edb49ff6cf2493e9835fd7951c99535ce456a3 /actionview/lib | |
| parent | 498373468144b434322e8c3b2611ac5fc54e72ad (diff) | |
| download | rails-2b617783ad37e1f008499ba8389f50d67e7b78b1.tar.gz rails-2b617783ad37e1f008499ba8389f50d67e7b78b1.tar.bz2 rails-2b617783ad37e1f008499ba8389f50d67e7b78b1.zip | |
excerpt() now accepts regular expression instances as phrases.
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 10 |
1 files changed, 7 insertions, 3 deletions
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] |