Update rss.rss.builder

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 9c4a24fd54a11c18e7d50d3b65e8b137e768dc24..7325a2a28f0825e19e575e800a25ac58d755d7e2 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,14 +1,24 @@
 module RichText
   def self.new(format, text)
     case format
 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
     end
   end
 
   class Base < String

+    include ActionView::Helpers::TagHelper
+

     def spam_score
       link_count = 0
       link_size = 0
     def spam_score
       link_count = 0
       link_size = 0


@@ -26,10 +36,14 @@ module RichText
         link_proportion = 0
       end
 
         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
 
     end
 

-  protected
+    protected
+
+    def simple_format(text)
+      SimpleFormat.new.simple_format(text)
+    end

 
     def linkify(text)
       if text.html_safe?
 
     def linkify(text)
       if text.html_safe?


@@ -41,18 +55,15 @@ module RichText
   end
 
   class HTML < Base
   end
 
   class HTML < Base

-    include ActionView::Helpers::TextHelper
-    include ActionView::Helpers::TagHelper
-

     def to_html
       linkify(sanitize(simple_format(self)))
     end
 
     def to_text
     def to_html
       linkify(sanitize(simple_format(self)))
     end
 
     def to_text

-      self
+      to_s

     end
 
     end
 

-  private
+    private

 
     def sanitize(text)
       Sanitize.clean(text, Sanitize::Config::OSM).html_safe
 
     def sanitize(text)
       Sanitize.clean(text, Sanitize::Config::OSM).html_safe


@@ -61,34 +72,43 @@ module RichText
 
   class Markdown < Base
     def to_html
 
   class Markdown < Base
     def to_html

-      html_parser.render(self).html_safe
+      Markdown.html_parser.render(self).html_safe

     end
 
     def to_text
     end
 
     def to_text

-      self
+      to_s

     end
 
     end
 

-  private
+    def self.html_renderer
+      @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
+    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 self.html_parser
+      @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)
+        "<a rel=\"nofollow\" href=\"#{link}\">#{alt_text}</a>"
+      end
+
+      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
     end
   end
 
   class Text < Base

-    include ActionView::Helpers::TextHelper
-

     def to_html
       linkify(simple_format(ERB::Util.html_escape(self)))
     end
 
     def to_text
     def to_html
       linkify(simple_format(ERB::Util.html_escape(self)))
     end
 
     def to_text

-      self
+      to_s

     end
   end
 end
     end
   end
 end