Merge pull request #5019 from tomhughes/oauth2-cleanup

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 1de7b882b2ae0da6cf7aa6e22557d9b547ac3431..a439342f7743f9b1fb8682147f6562a9ff0750ab 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -15,7 +15,7 @@ module RichText
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::OutputSafetyHelper
 
     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


@@ -44,9 +44,17 @@ module RichText
         doc.content.include?(phrase)
       end
 
         doc.content.include?(phrase)
       end
 

-      [link_proportion - 0.2, 0.0].max * 200 +
-        link_count * 40 +
-        spammy_phrases * 40
+      ([link_proportion - 0.2, 0.0].max * 200) +
+        (link_count * 40) +
+        (spammy_phrases * 40)
+    end
+
+    def image
+      nil
+    end
+
+    def image_alt
+      nil

     end
 
     protected
     end
 
     protected


@@ -61,9 +69,9 @@ module RichText
 
     def linkify(text, mode = :urls)
       if text.html_safe?
 
     def linkify(text, mode = :urls)
       if text.html_safe?

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

       else
       else

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

       end
     end
   end
       end
     end
   end


@@ -80,12 +88,41 @@ module RichText
 
   class Markdown < Base
     def to_html
 
   class Markdown < Base
     def to_html

-      linkify(sanitize(Kramdown::Document.new(self).to_html), :all)
+      linkify(sanitize(document.to_html), :all)

     end
 
     def to_text
       to_s
     end
     end
 
     def to_text
       to_s
     end

+
+    def image
+      @image_element = first_image_element(document.root) unless defined? @image_element
+      @image_element.attr["src"] if @image_element
+    end
+
+    def image_alt
+      @image_element = first_image_element(document.root) unless defined? @image_element
+      @image_element.attr["alt"] if @image_element
+    end
+
+    private
+
+    def document
+      @document ||= Kramdown::Document.new(self)
+    end
+
+    def first_image_element(element)
+      return element if image?(element) && element.attr["src"].present?
+
+      element.children.find do |child|
+        nested_image = first_image_element(child)
+        break nested_image if nested_image
+      end
+    end
+
+    def image?(element)
+      element.type == :img || (element.type == :html_element && element.value == "img")
+    end

   end
 
   class Text < Base
   end
 
   class Text < Base