X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f3c9f4edb40aa03fbf7458904e3774d2e11ff3a5..0bd2e9ea8c801e5b6cd570837fcd112f6f78b180:/lib/rich_text.rb
diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 87ea58933..83eb23540 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,15 +1,15 @@
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
@@ -25,21 +25,21 @@ 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
- return [link_proportion - 0.2, 0.0].max * 200 + link_count * 40
+ [link_proportion - 0.2, 0.0].max * 200 + link_count * 40
end
- protected
+ protected
def simple_format(text)
SimpleFormat.new.simple_format(text)
@@ -60,10 +60,10 @@ module RichText
end
def to_text
- self.to_s
+ to_s
end
- private
+ private
def sanitize(text)
Sanitize.clean(text, Sanitize::Config::OSM).html_safe
@@ -72,36 +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
- self.to_s
+ 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
@@ -111,7 +94,7 @@ module RichText
end
def to_text
- self.to_s
+ to_s
end
end
end