Update notes_controller_test to use note and note_comment factories

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 92be8903b03028d44483f24ba31fa5d96d331710..83eb235401c6f88cf0a0d6eab46b9ce781dcea2c 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,35 +1,49 @@
 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
 
       doc = Nokogiri::HTML(to_html)
 
     def spam_score
       link_count = 0
       link_size = 0
 
       doc = Nokogiri::HTML(to_html)
 

-      if doc.content.length > 0
+      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
         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
 
       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,48 +72,29 @@ 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 html_parser
-      @@html_renderer ||= Renderer.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_renderer
+      @html_renderer ||= Redcarpet::Render::XHTML.new(:filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" })

     end
 
     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 
+    def self.html_parser
+      @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true)

     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