Use model relations when creating objects from factories

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 7325a2a28f0825e19e575e800a25ac58d755d7e2..83eb235401c6f88cf0a0d6eab46b9ce781dcea2c 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -25,15 +25,15 @@ module RichText
 
       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
-      else
-        link_proportion = 0
       end
 
       [link_proportion - 0.2, 0.0].max * 200 + link_count * 40
@@ -80,26 +80,12 @@ module RichText
     end
 
     def self.html_renderer
-      @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
+      @html_renderer ||= Redcarpet::Render::XHTML.new(:filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" })
     end
 
     def self.html_parser
       @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true)
     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
-    end
   end
 
   class Text < Base