From: Anton Khorev Date: Wed, 7 Aug 2024 03:06:10 +0000 (+0300) Subject: Use first paragraph as richtext description X-Git-Tag: live~288^2~7 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/aa8dd75e5ec959e377f469a83bf67898472a67e5?hp=097a414b22a9068cd9af6ec758eb2876da3dd654 Use first paragraph as richtext description --- diff --git a/lib/rich_text.rb b/lib/rich_text.rb index f554e5ab5..b720f33e7 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -109,6 +109,11 @@ module RichText @image_element.attr["alt"] if @image_element end + def description + @paragraph_element = first_paragraph_element(document.root) unless defined? @paragraph_element + text_content(@paragraph_element) if @paragraph_element + end + private def document @@ -124,9 +129,37 @@ 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 + end + end + + def 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) } + end + end + append_text.call(element) + + text + end + def image?(element) element.type == :img || (element.type == :html_element && element.value == "img") end + + def paragraph?(element) + element.type == :p + end end class Text < Base diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb index 3e17cac7b..3536db398 100644 --- a/test/lib/rich_text_test.rb +++ b/test/lib/rich_text_test.rb @@ -335,6 +335,21 @@ class RichTextTest < ActiveSupport::TestCase assert_nil r.description end + def test_markdown_description + r = RichText.new("markdown", "This is an article about something.") + assert_equal "This is an article about something.", r.description + end + + def test_markdown_description_after_heading + r = RichText.new("markdown", "#Heading\n\nHere starts the text.") + assert_equal "Here starts the text.", 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 + end + private def assert_html(richtext, &block)