Use user factories for some changeset_controller tests.

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index ec5e9e473789a9d70c7e8fb770cac51e14be8137..83eb235401c6f88cf0a0d6eab46b9ce781dcea2c 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,28 +1,48 @@
 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 || "")
-    else; nil
+    when "html" then HTML.new(text || "")
+    when "markdown" then Markdown.new(text || "")
+    when "text" then Text.new(text || "")

     end
   end
 
     end
   end
 

-  class HTML < String
+  class SimpleFormat

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

-    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::OutputSafetyHelper

 
 

-    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.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
+      end
+
+      [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,47 @@ module RichText
     end
   end
 
     end
   end
 

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

     def to_html
     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
+
+    def self.html_renderer
+      @html_renderer ||= Redcarpet::Render::XHTML.new(:filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" })

     end
 
     end
 

-  private
+    def self.html_parser
+      @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true)
+    end
+  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
-      })
+  class Text < Base
+    def to_html
+      linkify(simple_format(ERB::Util.html_escape(self)))
+    end
+
+    def to_text
+      to_s

     end
   end
 end
     end
   end
 end