X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aa4205482a4af317ec26fc686793b57f02a6864a..37bf8e2f6e4349eb0a04781fca67b65fd66e1a47:/lib/rich_text.rb?ds=sidebyside diff --git a/lib/rich_text.rb b/lib/rich_text.rb index ec5e9e473..87ea58933 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -3,26 +3,46 @@ module RichText case format when "html"; HTML.new(text || "") when "markdown"; Markdown.new(text || "") + when "text"; Text.new(text || "") else; nil end end - class HTML < String + class SimpleFormat include ActionView::Helpers::TextHelper - include ActionView::Helpers::TagHelper - def to_html - linkify(sanitize(simple_format(self))) + def sanitize(text) + Sanitize.clean(text, Sanitize::Config::OSM).html_safe end + end - def to_text - self + class Base < String + include ActionView::Helpers::TagHelper + + def spam_score + link_count = 0 + link_size = 0 + + doc = Nokogiri::HTML(to_html) + + if doc.content.length > 0 + 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 + + return [link_proportion - 0.2, 0.0].max * 200 + link_count * 40 end - private + protected - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM).html_safe + def simple_format(text) + SimpleFormat.new.simple_format(text) end def linkify(text) @@ -34,24 +54,64 @@ module RichText end end - class Markdown < String + class HTML < Base + def to_html + linkify(sanitize(simple_format(self))) + end + + def to_text + self.to_s + end + + private + + def sanitize(text) + Sanitize.clean(text, Sanitize::Config::OSM).html_safe + end + end + + class Markdown < Base def to_html html_parser.render(self).html_safe end def to_text - self + self.to_s end private def html_parser - @@html_renderer ||= Redcarpet::Render::XHTML.new({ + @@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 }) 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 + end + end + + class Text < Base + def to_html + linkify(simple_format(ERB::Util.html_escape(self))) + end + + def to_text + self.to_s + end end end