Truncate long richtext descriptions

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index b0b83cf5a44df703bfaf61a9d8dedc0bbbcb2a1e..03800725ad98cc8af64c561288c4e0ff6269f39a 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 || "")


@@ -111,7 +113,7 @@ module RichText
 
     def description
       @paragraph_element = first_paragraph_element(document.root) unless defined? @paragraph_element
 
     def description
       @paragraph_element = first_paragraph_element(document.root) unless defined? @paragraph_element

-      text_content(@paragraph_element) if @paragraph_element
+      truncated_text_content(@paragraph_element) if @paragraph_element

     end
 
     private
     end
 
     private


@@ -138,19 +140,22 @@ module RichText
       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
+      text.truncate(MAX_DESCRIPTION_LENGTH)

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

diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index 929abf8230c033f1109d6edb44bb4efcf5ba7c97..e2cb5ea2655dabdcfd2ca3d0a8b09039257a0a68 100644 (file)
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -355,6 +355,17 @@ class RichTextTest < ActiveSupport::TestCase
     assert_equal "Can use HTML tags.", r.description
   end
 
     assert_equal "Can use HTML tags.", r.description
   end
 

+  def test_markdown_description_max_length
+    r = RichText.new("markdown", "x" * RichText::MAX_DESCRIPTION_LENGTH)
+    assert_equal "x" * RichText::MAX_DESCRIPTION_LENGTH, r.description
+
+    r = RichText.new("markdown", "y" * (RichText::MAX_DESCRIPTION_LENGTH + 1))
+    assert_equal "#{'y' * (RichText::MAX_DESCRIPTION_LENGTH - 3)}...", r.description
+
+    r = RichText.new("markdown", "*zzzzzzzzz*z" * ((RichText::MAX_DESCRIPTION_LENGTH + 1) / 10.0).ceil)
+    assert_equal "#{'z' * (RichText::MAX_DESCRIPTION_LENGTH - 3)}...", r.description
+  end
+

   private
 
   def assert_html(richtext, &block)
   private
 
   def assert_html(richtext, &block)