Use Redcarpet::Render::XHTML instead of our custom renderer

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 9c4a24fd54a11c18e7d50d3b65e8b137e768dc24..7d8010af1785ea6c9b275baf3fb572f997192ad2 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -8,7 +8,17 @@ module RichText
     end
   end
 
     end
   end
 

+  class SimpleFormat
+    include ActionView::Helpers::TextHelper
+
+    def sanitize(text)
+      Sanitize.clean(text, Sanitize::Config::OSM).html_safe
+    end
+  end
+

   class Base < String
   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,11 +36,15 @@ module RichText
         link_proportion = 0
       end
 
         link_proportion = 0
       end
 

-      return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20
+      return [link_proportion - 0.2, 0.0].max * 200 + link_count * 40

     end
 
   protected
 
     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
     def linkify(text)
       if text.html_safe?
         Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe


@@ -41,15 +55,12 @@ 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
+      self.to_s

     end
 
   private
     end
 
   private


@@ -65,14 +76,14 @@ module RichText
     end
 
     def to_text
     end
 
     def to_text

-      self
+      self.to_s

     end
 
   private
 
     def html_parser
       @@html_renderer ||= Redcarpet::Render::XHTML.new({
     end
 
   private
 
     def html_parser
       @@html_renderer ||= Redcarpet::Render::XHTML.new({

-        :filter_html => true, :safe_links_only => true
+        :filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" }

       })
       @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, {
         :no_intra_emphasis => true, :autolink => true, :space_after_headers => true
       })
       @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, {
         :no_intra_emphasis => true, :autolink => true, :space_after_headers => true


@@ -81,14 +92,12 @@ module RichText
   end
 
   class Text < Base
   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
+      self.to_s

     end
   end
 end
     end
   end
 end