(main) Fix IMG tag closing in parser-doxia-module (asciidoctor#930)

* Fix IMG tag closing in parser-doxia-module Fixes asciidoctor#783
abelsromero · Oct 8, 2024 · 2e74161 · 2e74161
1 parent 158f6f6
commit 2e74161
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -13,6 +13,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/main[co
 
 == Unreleased
 
+Bug Fixes::
+
+  * Fix open IMG tags in parser-doxia-module (#930)
+
 Build / Infrastructure::
 
   * Fix javadoc check flake in CI (#814)

diff --git a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy
@@ -175,7 +175,7 @@ class HtmlAsserter {
     }
 
     void containsImage(String value) {
-        def found = find("<img src=\"$value\" alt=\"Asciidoctor is awesome\">")
+        def found = find("<img src=\"$value\" alt=\"Asciidoctor is awesome\" />")
         assertFound("Image", value, found)
     }
 

diff --git a/...module/src/main/java/org/asciidoctor/maven/site/parser/processors/ImageNodeProcessor.java b/...module/src/main/java/org/asciidoctor/maven/site/parser/processors/ImageNodeProcessor.java
@@ -1,8 +1,10 @@
 package org.asciidoctor.maven.site.parser.processors;
 
+import javax.swing.text.html.HTML.Attribute;
 import java.nio.file.FileSystems;
 
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.maven.site.parser.NodeProcessor;
 
@@ -37,7 +39,9 @@ public void process(StructuralNode node) {
 
         final String imagesdir = (String) node.getAttribute("imagesdir");
         String imagePath = isBlank(imagesdir) ? target : formatPath(imagesdir, target);
-        getSink().rawText(String.format("<img src=\"%s\" alt=\"%s\">", imagePath, alt));
+        final SinkEventAttributeSet attributes = new SinkEventAttributeSet();
+        attributes.addAttribute(Attribute.ALT, alt);
+        getSink().figureGraphics(imagePath, attributes);
     }
 
     private String formatPath(String imagesdir, String target) {

diff --git a/...le/src/test/java/org/asciidoctor/maven/site/parser/processors/ImageNodeProcessorTest.java b/...le/src/test/java/org/asciidoctor/maven/site/parser/processors/ImageNodeProcessorTest.java
@@ -30,7 +30,7 @@ void should_convert_document_with_image() {
         String html = process(content, 0);
 
         assertThat(html)
-                .isEqualTo("<img src=\"images/tiger.png\" alt=\"Kitty\">");
+                .isEqualTo("<img src=\"images/tiger.png\" alt=\"Kitty\" />");
     }
 
     @Test
@@ -41,7 +41,7 @@ void should_convert_document_with_image_and_imagesdir_attribute() {
 
         final String separator = FileSystems.getDefault().getSeparator();
         assertThat(html)
-                .isEqualTo("<img src=\"prefix-path" + separator + "images/tiger.png\" alt=\"Kitty\">");
+                .isEqualTo("<img src=\"prefix-path" + separator + "images/tiger.png\" alt=\"Kitty\" />");
     }
 
     private String documentWithImage() {