Skip to content

Commit 807c23c

Browse files
committed
Replace EscapeUtils.escape_html with CGI.escape_html
EscapeUtils.escape_html was deprecated in 0da0c0a80017a18b2e007921782e83c8b94e6c41 and later removed. Regarding drop if / escape please see 0da0c0a80017a18b2e007921782e83c8b94e6c41: “there's no reason to escape for slashes `/` in 2022.” This commit makes the test suite green again.
1 parent 32a21be commit 807c23c

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

lib/html/pipeline/email_reply_filter.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ class EmailReplyFilter < TextFilter
3838
def call
3939
found_hidden = nil
4040
paragraphs = EmailReplyParser.read(text.dup).fragments.map do |fragment|
41-
pieces = [escape_html(fragment.to_s.strip).gsub(/^\s*(>|&gt;)/, '')]
41+
pieces = [CGI.escapeHTML(fragment.to_s.strip).gsub(/^\s*(>|&gt;)/, '')]
42+
4243
if fragment.quoted?
4344
if context[:hide_quoted_email_addresses]
4445
pieces.map! do |piece|

lib/html/pipeline/plain_text_input_filter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Pipeline
88
# in a div.
99
class PlainTextInputFilter < TextFilter
1010
def call
11-
"<div>#{EscapeUtils.escape_html(@text, false)}</div>"
11+
"<div>#{CGI.escape_html(@text)}</div>"
1212
end
1313
end
1414
end

lib/html/pipeline/toc_filter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def call
4747
uniq = headers[id] > 0 ? "-#{headers[id]}" : ''
4848
headers[id] += 1
4949
if header_content = node.children.first
50-
result[:toc] << %(<li><a href="##{id}#{uniq}">#{EscapeUtils.escape_html(text)}</a></li>\n)
50+
result[:toc] << %(<li><a href="##{id}#{uniq}">#{CGI.escape_html(text)}</a></li>\n)
5151
header_content.add_previous_sibling(%(<a id="#{id}#{uniq}" class="anchor" href="##{id}#{uniq}" aria-hidden="true">#{anchor_icon}</a>))
5252
end
5353
end

test/html/pipeline/email_reply_filter_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def test_preserves_non_email_content_while_filtering
5959
<div class="email-quoted-reply"> * Do you need -DCMAKE_SYSTEM_PROCESSOR=x86?</div>
6060
<div class="email-fragment">Yes, this is a bit dumb, but vc checks for that (or amd) to determine that it&#39;s not being built on ARM.</div>
6161
<span class="email-hidden-toggle"><a href="#">&hellip;</a></span><div class="email-hidden-reply" style="display:none"><div class="email-signature-reply">--
62-
Boaty McBoatface | http:&#47;&#47;example.org</div>
62+
Boaty McBoatface | http://example.org</div>
6363
</div>
6464
EXPECTED
6565

test/html/pipeline/syntax_highlight_filter_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ def test_highlight_keeps_the_pre_tags_lang
5353

5454
def test_highlight_handles_nested_pre_tags
5555
inner_code = "<pre>console.log('i am nested!')</pre>"
56-
escaped = EscapeUtils.escape_html(inner_code)
56+
escaped = CGI.escape_html(inner_code)
5757
html = "<pre lang='html'>#{escaped}</pre>"
5858
filter = SyntaxHighlightFilter.new html, highlight: 'html'
5959

6060
doc = filter.call
6161

6262
assert_equal 2, doc.css('span[class=nt]').length
63-
assert_equal EscapeUtils.unescape_html(escaped), doc.inner_text
63+
assert_equal CGI.unescape_html(escaped), doc.inner_text
6464
end
6565
end

0 commit comments

Comments
 (0)