X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..f4d2a01484a216cb8dd37671270694bdfec7a629:/lib/rich_text.rb diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 503ecedbd..83eb23540 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -4,7 +4,6 @@ module RichText when "html" then HTML.new(text || "") when "markdown" then Markdown.new(text || "") when "text" then Text.new(text || "") - else; nil end end @@ -26,15 +25,15 @@ module RichText doc = Nokogiri::HTML(to_html) - if doc.content.length > 0 + if doc.content.empty? + link_proportion = 0 + else doc.xpath("//a").each do |link| link_count += 1 link_size += link.content.length end link_proportion = link_size.to_f / doc.content.length.to_f - else - link_proportion = 0 end [link_proportion - 0.2, 0.0].max * 200 + link_count * 40 @@ -73,32 +72,19 @@ module RichText class Markdown < Base def to_html - html_parser.render(self).html_safe + Markdown.html_parser.render(self).html_safe end def to_text to_s end - private - - def html_parser - @@html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true) - @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true) + def self.html_renderer + @html_renderer ||= Redcarpet::Render::XHTML.new(:filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" }) end - class Renderer < Redcarpet::Render::XHTML - def link(link, _title, alt_text) - "#{alt_text}" - end - - def autolink(link, link_type) - if link_type == :email - "#{link}" - else - "#{link}" - end - end + def self.html_parser + @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true) end end