Merge remote-tracking branch 'upstream/pull/2161'

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 7325a2a28f0825e19e575e800a25ac58d755d7e2..2b3e07d6acb72b0221379ea0d0a80c681f383b78 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,4 +1,8 @@
 module RichText
 module RichText

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

   def self.new(format, text)
     case format
     when "html" then HTML.new(text || "")
   def self.new(format, text)
     case format
     when "html" then HTML.new(text || "")


@@ -25,18 +29,24 @@ 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
 

-      [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
 
     protected
     end
 
     protected


@@ -45,11 +55,15 @@ module RichText
       SimpleFormat.new.simple_format(text)
     end
 
       SimpleFormat.new.simple_format(text)
     end
 

-    def linkify(text)
+    def sanitize(text)
+      Sanitize.clean(text, Sanitize::Config::OSM).html_safe
+    end
+
+    def linkify(text, mode = :urls)

       if text.html_safe?
       if text.html_safe?

-        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+        Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferer")).html_safe

       else
       else

-        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
+        Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferer"))

       end
     end
   end
       end
     end
   end


@@ -62,44 +76,16 @@ module RichText
     def to_text
       to_s
     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
   end
 
   class Markdown < Base
     def to_html

-      Markdown.html_parser.render(self).html_safe
+      linkify(sanitize(Kramdown::Document.new(self).to_html), :all)

     end
 
     def to_text
       to_s
     end
     end
 
     def to_text
       to_s
     end

-
-    def self.html_renderer
-      @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
-    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
   end
 
   class Text < Base