aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers/text_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Added processing of `nil` to `highlight` helper methodigor042014-09-301-1/+1
|
* Deal with regex match groups in excerptGareth Rees2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation has bugs if the regex contains a match group. Example: excerpt('This is a beautiful? morning', /\b(beau\w*)\b/i, :radius => 5) Expected: "...is a beautiful? mor..." Actual: "...is a beautifulbeaut..." The original phrase was being converted to a regex and returning the text either side of the phrase as expected: 'This is a beautiful? morning'.split(/beautiful/i, 2) # => ["This is a ", "? morning"] When we have a match with groups the match is returned in the array. Quoting the ruby docs: "If pattern is a Regexp, str is divided where the pattern matches. [...] If pattern contains groups, the respective matches will be returned in the array as well." 'This is a beautiful? morning'.split(/\b(beau\w*)\b/iu, 2) # => ["This is a ", "beautiful", "? morning"] If we assume we want to split on the first match – this fix makes that assumption – we can pass the already assigned `phrase` variable as the place to split (because we already know that a match exists from line 168). Originally spotted by Louise Crow (@crowbot) at https://github.com/mysociety/alaveteli/pull/1557
* 'TextHelper#highlight' now accepts a block to highlight the matched words.Lucas Mazza2014-06-191-3/+14
| | | | | | | | 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>'
* highlight() now accepts regular expressions as well.Jan Szumiec2014-06-191-4/+6
|
* excerpt() now accepts regular expression instances as phrases.Jan Szumiec2014-06-191-3/+7
|
* Fixed documentation. [ci skip]Konstantin Wlasow2014-01-041-0/+3
|
* Merge pull request #13059 from imkmf/cycle-accepts-arrayRafael Mendonça França2013-12-061-1/+1
|\ | | | | | | | | | | | | Cycle object should accept an array Conflicts: actionview/CHANGELOG.md
| * A Cycle object should accept an array and cycle through it as it wouldKristian Freeman2013-12-061-1/+1
| | | | | | | | with a set of comma-separated objects.
* | Fix issue where TextHelper#simple_format was calling missing 'raw' methodMario Visic2013-12-051-0/+2
| |
* | Remove the escaping skipRafael Mendonça França2013-12-031-1/+1
| | | | | | | | | | We are generating safe strings in the paragraph, so we can escape the tags
* | Ensure simple_format escapes its html attributesMichael Koziarski2013-12-021-1/+1
|/ | | | | | | | | | The previous behavior equated the sanitize option for simple_format with the escape option of content_tag, however these are two distinct concepts. This fixes CVE-2013-6416 Conflicts: actionview/lib/action_view/helpers/text_helper.rb
* fix simple_format escapes own output when sanitize is set to truepseidemann2013-11-081-1/+1
|
* Cleanup of excerpt helperPaul Nikitochkin2013-09-061-2/+3
| | | | | * replaced String concatenation by joining * separator has default value to '', even it is nil
* Removed an unnecessary loop - it kills performance on large texts.Jan Szumiec2013-08-031-4/+6
|
* Change from `map` => `map!` and `collect!` to save creation of extra array.Vipul A M2013-07-311-2/+2
|
* Fix simple_format output example ending tagMatt Bridges2013-07-091-1/+1
|
* Move actionpack/lib/action_view* into actionview/libPiotr Sarnacki2013-06-201-0/+442