Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: HtmlToMarkdown should not convert empty/bad <a> tags

This commit is contained in:
Régis Hanol 2017-05-03 16:42:37 +02:00
parent 1706036f2b
commit edbf12622b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/html_to_markdown.rb
View File

@ -143,9 +143,14 @@ class HtmlToMarkdown
end end
def visit_a(node) def visit_a(node)
@stack[-1].markdown << "[" href = node["href"]
traverse(node) if href.present? && (href.start_with?("http") || href.start_with?("www."))
@stack[-1].markdown << "](#{node["href"]})" @stack[-1].markdown << "["
traverse(node)
@stack[-1].markdown << "](#{href})"
else
traverse(node)
end
end end
def visit_tt(node) def visit_tt(node)

6
spec/components/html_to_markdown_spec.rb
View File

@ -31,6 +31,12 @@ describe HtmlToMarkdown do
expect(html_to_markdown(%Q{<a href="https://www.discourse.org">Discourse</a>})).to eq("[Discourse](https://www.discourse.org)") expect(html_to_markdown(%Q{<a href="https://www.discourse.org">Discourse</a>})).to eq("[Discourse](https://www.discourse.org)")
end end
it "removes empty & invalid <a>" do
expect(html_to_markdown(%Q{<a>Discourse</a>})).to eq("Discourse")
expect(html_to_markdown(%Q{<a href="">Discourse</a>})).to eq("Discourse")
expect(html_to_markdown(%Q{<a href="foo.bar">Discourse</a>})).to eq("Discourse")
end
HTML_WITH_IMG ||= %Q{<img src="https://www.discourse.org/logo.svg" alt="Discourse Logo">} HTML_WITH_IMG ||= %Q{<img src="https://www.discourse.org/logo.svg" alt="Discourse Logo">}
it "converts <img>" do it "converts <img>" do