diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index edfa535f4..a439342f7 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -53,6 +53,10 @@ module RichText
nil
end
+ def image_alt
+ nil
+ end
+
protected
def simple_format(text)
@@ -92,9 +96,13 @@ module RichText
end
def image
- return @image if defined? @image
+ @image_element = first_image_element(document.root) unless defined? @image_element
+ @image_element.attr["src"] if @image_element
+ end
- @image = first_image_element(document.root)&.attr&.[]("src")
+ def image_alt
+ @image_element = first_image_element(document.root) unless defined? @image_element
+ @image_element.attr["alt"] if @image_element
end
private
diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index e601c36fc..e0b315276 100644
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -253,61 +253,79 @@ class RichTextTest < ActiveSupport::TestCase
def test_text_no_image
r = RichText.new("text", "foo https://example.com/ bar")
assert_nil r.image
+ assert_nil r.image_alt
end
def test_html_no_image
r = RichText.new("html", "foo bar baz")
assert_nil r.image
+ assert_nil r.image_alt
end
def test_markdown_no_image
r = RichText.new("markdown", "foo [bar](https://example.com/) baz")
assert_nil r.image
+ assert_nil r.image_alt
end
def test_markdown_image
r = RichText.new("markdown", "foo  baz")
assert_equal "https://example.com/image.jpg", r.image
+ assert_equal "bar", r.image_alt
end
def test_markdown_first_image
r = RichText.new("markdown", "foo  baz\nfoo  baz")
assert_equal "https://example.com/image1.jpg", r.image
+ assert_equal "bar1", r.image_alt
end
def test_markdown_image_with_empty_src
r = RichText.new("markdown", "![invalid]()")
assert_nil r.image
+ assert_nil r.image_alt
end
def test_markdown_skip_image_with_empty_src
r = RichText.new("markdown", "![invalid]() ")
assert_equal "https://example.com/valid.gif", r.image
+ assert_equal "valid", r.image_alt
end
def test_markdown_html_image
+ r = RichText.new("markdown", "
")
+ assert_equal "https://example.com/img_element.png", r.image
+ assert_equal "alt text here", r.image_alt
+ end
+
+ def test_markdown_html_image_without_alt
r = RichText.new("markdown", "
")
assert_equal "https://example.com/img_element.png", r.image
+ assert_nil r.image_alt
end
def test_markdown_html_image_with_empty_src
- r = RichText.new("markdown", "
")
+ r = RichText.new("markdown", "
")
assert_nil r.image
+ assert_nil r.image_alt
end
def test_markdown_skip_html_image_with_empty_src
- r = RichText.new("markdown", "
")
+ r = RichText.new("markdown", "
")
assert_equal "https://example.com/next_img_element.png", r.image
+ assert_equal "have src", r.image_alt
end
def test_markdown_html_image_without_src
- r = RichText.new("markdown", "
")
+ r = RichText.new("markdown", "
")
assert_nil r.image
+ assert_nil r.image_alt
end
def test_markdown_skip_html_image_without_src
- r = RichText.new("markdown", "
")
+ r = RichText.new("markdown", "
")
assert_equal "https://example.com/next_img_element.png", r.image
+ assert_equal "have src", r.image_alt
end
private