X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8f4a9a4b870f7b15652eb125c675bf635c7b0484..a34935df9bb03991b3d3c8bb8db7b8fd1433e566:/lib/rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index f2a558e6a..7325a2a28 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,13 +1,24 @@
 module RichText
   def self.new(format, text)
     case format
-    when "html"; HTML.new(text || "")
-    when "markdown"; Markdown.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
@@ -25,55 +36,79 @@ module RichText
         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
+
+    def simple_format(text)
+      SimpleFormat.new.simple_format(text)
+    end
+
+    def linkify(text)
+      if text.html_safe?
+        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+      else
+        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
+      end
     end
   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
     end
-
-    def linkify(text)
-      if text.html_safe?
-        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
-      else
-        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
-      end
-    end
   end
 
   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
+
+    def self.html_renderer
+      @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
+    end
+
+    def self.html_parser
+      @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true)
     end
 
-  private
+    class Renderer < Redcarpet::Render::XHTML
+      def link(link, _title, alt_text)
+        "<a rel=\"nofollow\" href=\"#{link}\">#{alt_text}</a>"
+      end
 
-    def html_parser
-      @@html_renderer ||= Redcarpet::Render::XHTML.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 autolink(link, link_type)
+        if link_type == :email
+          "<a rel=\"nofollow\" href=\"mailto:#{link}\">#{link}</a>"
+        else
+          "<a rel=\"nofollow\" href=\"#{link}\">#{link}</a>"
+        end
+      end
+    end
+  end
+
+  class Text < Base
+    def to_html
+      linkify(simple_format(ERB::Util.html_escape(self)))
+    end
+
+    def to_text
+      to_s
     end
   end
 end