Add image_alt accessor to rich text

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index edfa535f434c07d23fb88412ad9dd673c38645d5..a439342f7743f9b1fb8682147f6562a9ff0750ab 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -53,6 +53,10 @@ module RichText
       nil
     end
 
       nil
     end
 

+    def image_alt
+      nil
+    end
+

     protected
 
     def simple_format(text)
     protected
 
     def simple_format(text)


@@ -92,9 +96,13 @@ module RichText
     end
 
     def image
     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
     end
 
     private

diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index e601c36fc5d3b1c27a1443985e9110840fded551..e0b31527669d5f1d8583cdfbe65c483d58a6ec58 100644 (file)
--- 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
   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 <a href='https://example.com/'>bar</a> baz")
     assert_nil r.image
   end
 
   def test_html_no_image
     r = RichText.new("html", "foo <a href='https://example.com/'>bar</a> 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
   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 ![bar](https://example.com/image.jpg) baz")
     assert_equal "https://example.com/image.jpg", r.image
   end
 
   def test_markdown_image
     r = RichText.new("markdown", "foo ![bar](https://example.com/image.jpg) 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 ![bar1](https://example.com/image1.jpg) baz\nfoo ![bar2](https://example.com/image2.jpg) baz")
     assert_equal "https://example.com/image1.jpg", r.image
   end
 
   def test_markdown_first_image
     r = RichText.new("markdown", "foo ![bar1](https://example.com/image1.jpg) baz\nfoo ![bar2](https://example.com/image2.jpg) 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
   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]() ![valid](https://example.com/valid.gif)")
     assert_equal "https://example.com/valid.gif", r.image
   end
 
   def test_markdown_skip_image_with_empty_src
     r = RichText.new("markdown", "![invalid]() ![valid](https://example.com/valid.gif)")
     assert_equal "https://example.com/valid.gif", r.image

+    assert_equal "valid", r.image_alt

   end
 
   def test_markdown_html_image
   end
 
   def test_markdown_html_image

+    r = RichText.new("markdown", "<img src='https://example.com/img_element.png' alt='alt text here'>")
+    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", "<img src='https://example.com/img_element.png'>")
     assert_equal "https://example.com/img_element.png", r.image
     r = RichText.new("markdown", "<img src='https://example.com/img_element.png'>")
     assert_equal "https://example.com/img_element.png", r.image

+    assert_nil r.image_alt

   end
 
   def test_markdown_html_image_with_empty_src
   end
 
   def test_markdown_html_image_with_empty_src

-    r = RichText.new("markdown", "<img src=''>")
+    r = RichText.new("markdown", "<img src='' alt='forgot src'>")

     assert_nil r.image
     assert_nil r.image

+    assert_nil r.image_alt

   end
 
   def test_markdown_skip_html_image_with_empty_src
   end
 
   def test_markdown_skip_html_image_with_empty_src

-    r = RichText.new("markdown", "<img src=''> <img src='https://example.com/next_img_element.png'>")
+    r = RichText.new("markdown", "<img src='' alt='forgot src'> <img src='https://example.com/next_img_element.png' alt='have src'>")

     assert_equal "https://example.com/next_img_element.png", r.image
     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
   end
 
   def test_markdown_html_image_without_src

-    r = RichText.new("markdown", "<img>")
+    r = RichText.new("markdown", "<img alt='totally forgot src'>")

     assert_nil r.image
     assert_nil r.image

+    assert_nil r.image_alt

   end
 
   def test_markdown_skip_html_image_without_src
   end
 
   def test_markdown_skip_html_image_without_src

-    r = RichText.new("markdown", "<img> <img src='https://example.com/next_img_element.png'>")
+    r = RichText.new("markdown", "<img alt='totally forgot src'> <img src='https://example.com/next_img_element.png' alt='have src'>")

     assert_equal "https://example.com/next_img_element.png", r.image
     assert_equal "https://example.com/next_img_element.png", r.image

+    assert_equal "have src", r.image_alt

   end
 
   private
   end
 
   private