From: Anton Khorev <tony29@yandex.ru>
Date: Wed, 7 Aug 2024 04:46:10 +0000 (+0300)
Subject: Skip paragraphs with no text when looking for richtext description
X-Git-Tag: live~306^2~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6be766d015c692703d053997e5575f13f77d442a

Skip paragraphs with no text when looking for richtext description
---

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 03800725a..bdf9c37ca 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -112,8 +112,9 @@ module RichText
     end
 
     def description
-      @paragraph_element = first_paragraph_element(document.root) unless defined? @paragraph_element
-      truncated_text_content(@paragraph_element) if @paragraph_element
+      return @description if defined? @description
+
+      @description = first_truncated_text_content(document.root)
     end
 
     private
@@ -131,12 +132,14 @@ module RichText
       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
 
@@ -155,6 +158,8 @@ module RichText
       end
       append_text.call(element)
 
+      return nil if text.blank?
+
       text.truncate(MAX_DESCRIPTION_LENGTH)
     end
 
diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index e2cb5ea26..63c70b099 100644
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -345,6 +345,16 @@ class RichTextTest < ActiveSupport::TestCase
     assert_equal "Here starts the text.", r.description
   end
 
+  def test_markdown_description_after_image
+    r = RichText.new("markdown", "![bar](https://example.com/image.jpg)\n\nThis is below the image.")
+    assert_equal "This is below the image.", r.description
+  end
+
+  def test_markdown_description_only_first_paragraph
+    r = RichText.new("markdown", "This thing.\n\nMaybe also that thing.")
+    assert_equal "This thing.", r.description
+  end
+
   def test_markdown_description_elements
     r = RichText.new("markdown", "*Something* **important** [here](https://example.com/).")
     assert_equal "Something important here.", r.description