Merge remote-tracking branch 'openstreetmap/pull/1122'

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index bb2baddc81991832ef24e115b93183e3a1c4e865..9e43ed29c0c96e3079dc02efacdc9e4128a6f686 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -25,15 +25,15 @@ 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
 
       [link_proportion - 0.2, 0.0].max * 200 + link_count * 40
       end
 
       [link_proportion - 0.2, 0.0].max * 200 + link_count * 40


@@ -72,18 +72,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
       to_s
     end
 
     end
 
     def to_text
       to_s
     end
 

-    private
+    def self.html_renderer
+      @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
+    end

 
 

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

     end
 
     class Renderer < Redcarpet::Render::XHTML
     end
 
     class Renderer < Redcarpet::Render::XHTML