Clarify image dimensions

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 7d8010af1785ea6c9b275baf3fb572f997192ad2..db296967ba3aa13d43371a67ba2dec87505cf8a2 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,15 +1,19 @@
 module RichText
 module RichText

+  SPAMMY_PHRASES = [
+    "Business Description:", "Additional Keywords:"
+  ].freeze
+

   def self.new(format, text)
     case format
   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
     end
   end
 
   class SimpleFormat
     include ActionView::Helpers::TextHelper

+    include ActionView::Helpers::OutputSafetyHelper

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


@@ -25,21 +29,27 @@ module RichText
 
       doc = Nokogiri::HTML(to_html)
 
 
       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 * 40
+      spammy_phrases = SPAMMY_PHRASES.count do |phrase|
+        doc.content.include?(phrase)
+      end
+
+      [link_proportion - 0.2, 0.0].max * 200 +
+        link_count * 40 +
+        spammy_phrases * 40

     end
 
     end
 

-  protected
+    protected

 
     def simple_format(text)
       SimpleFormat.new.simple_format(text)
 
     def simple_format(text)
       SimpleFormat.new.simple_format(text)


@@ -60,10 +70,10 @@ module RichText
     end
 
     def to_text
     end
 
     def to_text

-      self.to_s
+      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


@@ -72,22 +82,19 @@ 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
+      to_s

     end
 
     end
 

-  private
+    def self.html_renderer
+      @html_renderer ||= Redcarpet::Render::XHTML.new(:filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" })
+    end

 
 

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

     end
   end
 
     end
   end
 


@@ -97,7 +104,7 @@ module RichText
     end
 
     def to_text
     end
 
     def to_text

-      self.to_s
+      to_s

     end
   end
 end
     end
   end
 end