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

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index b720f33e700cfe75536dddf1a6440afcc49361d8..bdf9c37ca7359eec1f2cea57c2243178d8ce7791 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -3,6 +3,8 @@ module RichText
     "Business Description:", "Additional Keywords:"
   ].freeze
 
     "Business Description:", "Additional Keywords:"
   ].freeze
 

+  MAX_DESCRIPTION_LENGTH = 500
+

   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 || "")


@@ -110,8 +112,9 @@ module RichText
     end
 
     def description
     end
 
     def description

-      @paragraph_element = first_paragraph_element(document.root) unless defined? @paragraph_element
-      text_content(@paragraph_element) if @paragraph_element
+      return @description if defined? @description
+
+      @description = first_truncated_text_content(document.root)

     end
 
     private
     end
 
     private


@@ -129,28 +132,35 @@ module RichText
       end
     end
 
       end
     end
 

-    def first_paragraph_element(element)
-      return element if paragraph?(element)
-
-      element.children.find do |child|
-        nested_paragraph = first_paragraph_element(child)
-        break nested_paragraph if nested_paragraph
+    def first_truncated_text_content(element)
+      if paragraph?(element)
+        truncated_text_content(element)
+      else
+        element.children.find do |child|
+          text = first_truncated_text_content(child)
+          break text unless text.nil?
+        end

       end
     end
 
       end
     end
 

-    def text_content(element)
+    def truncated_text_content(element)

       text = ""
 
       append_text = lambda do |child|
         if child.type == :text
           text << child.value
         else
       text = ""
 
       append_text = lambda do |child|
         if child.type == :text
           text << child.value
         else

-          child.children.each { |c| append_text.call(c) }
+          child.children.each do |c|
+            append_text.call(c)
+            break if text.length > MAX_DESCRIPTION_LENGTH
+          end

         end
       end
       append_text.call(element)
 
         end
       end
       append_text.call(element)
 

-      text
+      return nil if text.blank?
+
+      text.truncate(MAX_DESCRIPTION_LENGTH)

     end
 
     def image?(element)
     end
 
     def image?(element)


@@ -158,7 +168,7 @@ module RichText
     end
 
     def paragraph?(element)
     end
 
     def paragraph?(element)

-      element.type == :p
+      element.type == :p || (element.type == :html_element && element.value == "p")

     end
   end
 
     end
   end