X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/584806af9239154f3af22da3e66a054c2d8e147f..c302174b0c532ded0eb7a808ba4556a67b96a111:/lib/rich_text.rb
diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 92be8903b..83eb23540 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,35 +1,49 @@
module RichText
def self.new(format, text)
case format
- when "html"; HTML.new(text || "")
- when "markdown"; Markdown.new(text || "")
- when "text"; Text.new(text || "")
- else; nil
+ when "html" then HTML.new(text || "")
+ when "markdown" then Markdown.new(text || "")
+ when "text" then Text.new(text || "")
+ end
+ end
+
+ class SimpleFormat
+ include ActionView::Helpers::TextHelper
+ include ActionView::Helpers::OutputSafetyHelper
+
+ def sanitize(text)
+ Sanitize.clean(text, Sanitize::Config::OSM).html_safe
end
end
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
+ 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
- return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20
+ [link_proportion - 0.2, 0.0].max * 200 + link_count * 40
end
- protected
+ protected
+
+ def simple_format(text)
+ SimpleFormat.new.simple_format(text)
+ end
def linkify(text)
if text.html_safe?
@@ -41,18 +55,15 @@ module RichText
end
class HTML < Base
- include ActionView::Helpers::TextHelper
- include ActionView::Helpers::TagHelper
-
def to_html
linkify(sanitize(simple_format(self)))
end
def to_text
- self
+ to_s
end
- private
+ private
def sanitize(text)
Sanitize.clean(text, Sanitize::Config::OSM).html_safe
@@ -61,48 +72,29 @@ 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
- self
+ 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
class Text < Base
- include ActionView::Helpers::TextHelper
-
def to_html
linkify(simple_format(ERB::Util.html_escape(self)))
end
def to_text
- self
+ to_s
end
end
end