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

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 7d8010af1785ea6c9b275baf3fb572f997192ad2..f19d3d3a952ddd2c8240e2ea8da228c434523ffc 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -1,17 +1,21 @@
 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)
+    def sanitize(text, _options = {})

       Sanitize.clean(text, Sanitize::Config::OSM).html_safe
     end
   end
       Sanitize.clean(text, Sanitize::Config::OSM).html_safe
     end
   end


@@ -25,31 +29,45 @@ 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
 
         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
+        link_proportion = link_size.to_f / doc.content.length

       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
+
+    def image
+      nil

     end
 
     end
 

-  protected
+    protected

 
     def simple_format(text)
       SimpleFormat.new.simple_format(text)
     end
 
 
     def simple_format(text)
       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 noreferrer")).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 noreferrer"))

       end
     end
   end
       end
     end
   end


@@ -60,34 +78,38 @@ module RichText
     end
 
     def to_text
     end
 
     def to_text

-      self.to_s
-    end
-
-  private
-
-    def sanitize(text)
-      Sanitize.clean(text, Sanitize::Config::OSM).html_safe
+      to_s

     end
   end
 
   class Markdown < Base
     def to_html
     end
   end
 
   class Markdown < Base
     def to_html

-      html_parser.render(self).html_safe
+      linkify(sanitize(document.to_html), :all)

     end
 
     def to_text
     end
 
     def to_text

-      self.to_s
+      to_s

     end
 
     end
 

-  private
+    def image
+      return @image if defined? @image

 
 

-    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
-      })
+      @image = first_image_element(document.root)&.attr&.[]("src")
+    end
+
+    private
+
+    def document
+      @document ||= Kramdown::Document.new(self)
+    end
+
+    def first_image_element(element)
+      return element if element.type == :img
+
+      element.children.find do |child|
+        nested_image = first_image_element(child)
+        break nested_image if nested_image
+      end

     end
   end
 
     end
   end
 


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

-      self.to_s
+      to_s

     end
   end
 end
     end
   end
 end