From: Anton Khorev Date: Wed, 7 Aug 2024 03:53:43 +0000 (+0300) Subject: Truncate long richtext descriptions X-Git-Tag: live~245^2~5 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/88a7ca5625344e31538600d251ab227824582467 Truncate long richtext descriptions --- diff --git a/lib/rich_text.rb b/lib/rich_text.rb index b0b83cf5a..03800725a 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -3,6 +3,8 @@ module RichText "Business Description:", "Additional Keywords:" ].freeze + MAX_DESCRIPTION_LENGTH = 500 + 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 - text_content(@paragraph_element) if @paragraph_element + truncated_text_content(@paragraph_element) if @paragraph_element end private @@ -138,19 +140,22 @@ module RichText 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 - 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) - text + text.truncate(MAX_DESCRIPTION_LENGTH) end def image?(element) diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb index 929abf823..e2cb5ea26 100644 --- 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 + 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)