Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Have text helpers use built in Regexp.escape rather than home grown a…

…lternative

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2350 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit b54560600b06112723adf286141a9cd7ed67b638 1 parent bbfde01
Marcel Molina authored
View
9 actionpack/lib/action_view/helpers/text_helper.rb
@@ -35,7 +35,7 @@ def truncate(text, length = 30, truncate_string = "...")
# N.B.: The +phrase+ is sanitized to include only letters, digits, and spaces before use.
def highlight(text, phrase, highlighter = '<strong class="highlight">\1</strong>')
if phrase.blank? then return text end
- text.gsub(/(#{escape_regexp(phrase)})/i, highlighter) unless text.nil?
+ text.gsub(/(#{Regexp.escape(phrase)})/i, highlighter) unless text.nil?
end
# Extracts an excerpt from the +text+ surrounding the +phrase+ with a number of characters on each side determined
@@ -43,7 +43,7 @@ def highlight(text, phrase, highlighter = '<strong class="highlight">\1</strong>
# excerpt("hello my world", "my", 3) => "...lo my wo..."
def excerpt(text, phrase, radius = 100, excerpt_string = "...")
if text.nil? || phrase.nil? then return end
- phrase = escape_regexp(phrase)
+ phrase = Regexp.escape(phrase)
if found_pos = text =~ /(#{phrase})/i
start_pos = [ found_pos - radius, 0 ].max
@@ -280,11 +280,6 @@ def set_cycle(name, cycle_object)
@_cycles[name] = cycle_object
end
- # Returns a version of the text that's safe to use in a regular expression without triggering engine features.
- def escape_regexp(text)
- text.gsub(/([\\|?+*\/\)\(])/) { |m| "\\#{$1}" }
- end
-
AUTO_LINK_RE = /
( # leading text
<\w+.*?>| # leading HTML tag, or
View
6 actionpack/test/template/text_helper_test.rb
@@ -100,7 +100,13 @@ def test_excerpt
assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", 5))
assert_nil excerpt("This is a beautiful morning", "day")
end
+
+ def test_excerpt_with_regex
+ assert_equal('...is a beautiful! morn...', excerpt('This is a beautiful! morning', 'beautiful', 5))
+ assert_equal('...is a beautiful? morn...', excerpt('This is a beautiful? morning', 'beautiful', 5))
+ end
+
def test_word_wrap
assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", 15))
end
Please sign in to comment.
Something went wrong with that request. Please try again.