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 ec5e9e473789a9d70c7e8fb770cac51e14be8137..7d8010af1785ea6c9b275baf3fb572f997192ad2 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -3,26 +3,46 @@ module RichText
     case format
     when "html"; HTML.new(text || "")
     when "markdown"; Markdown.new(text || "")
     case format
     when "html"; HTML.new(text || "")
     when "markdown"; Markdown.new(text || "")

+    when "text"; Text.new(text || "")

     else; nil
     end
   end
 
     else; nil
     end
   end
 

-  class HTML < String
+  class SimpleFormat

     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::TextHelper

-    include ActionView::Helpers::TagHelper

 
 

-    def to_html
-      linkify(sanitize(simple_format(self)))
+    def sanitize(text)
+      Sanitize.clean(text, Sanitize::Config::OSM).html_safe

     end
     end

+  end

 
 

-    def to_text
-      self
+  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
+        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

     end
 
     end
 

-  private
+  protected

 
 

-    def sanitize(text)
-      Sanitize.clean(text, Sanitize::Config::OSM).html_safe
+    def simple_format(text)
+      SimpleFormat.new.simple_format(text)

     end
 
     def linkify(text)
     end
 
     def linkify(text)


@@ -34,24 +54,50 @@ module RichText
     end
   end
 
     end
   end
 

-  class Markdown < String
+  class HTML < Base
+    def to_html
+      linkify(sanitize(simple_format(self)))
+    end
+
+    def to_text
+      self.to_s
+    end
+
+  private
+
+    def sanitize(text)
+      Sanitize.clean(text, Sanitize::Config::OSM).html_safe
+    end
+  end
+
+  class Markdown < Base

     def to_html
       html_parser.render(self).html_safe
     end
 
     def to_text
     def to_html
       html_parser.render(self).html_safe
     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
       })
     end
   end
       })
       @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, {
         :no_intra_emphasis => true, :autolink => true, :space_after_headers => true
       })
     end
   end

+
+  class Text < Base
+    def to_html
+      linkify(simple_format(ERB::Util.html_escape(self)))
+    end
+
+    def to_text
+      self.to_s
+    end
+  end

 end
 end