Avoid HTML tags in AsciiDoc titles

avisi-cloud · Aug 14, 2024 · 7c41d00 · 7c41d00
1 parent fb56c10
commit 7c41d00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/ContentTitle.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/ContentTitle.kt
@@ -20,17 +20,17 @@ private fun Section.markdownTitle(): String {
 
     val header = document.children.firstOrNull { it is Heading }?.let { it as Heading }
     if (header != null)
-        return header.text.toString()
+        return header.text.toString().trim()
 
     return "untitled document"
 }
 
 private fun Section.asciidocTitle(): String {
-    val options = Options.builder().safe(SafeMode.SERVER).build()
+    val options = Options.builder().safe(SafeMode.SERVER).backend("text").build()
     val document = asciidoctorWithTextConverter.load(content, options)
 
     if (document.title != null && document.title.isNotEmpty())
-        return document.title
+        return document.title.trim()
 
     return "untitled document"
 }
diff --git a/src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/ContentTitleTest.kt b/src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/ContentTitleTest.kt
@@ -8,6 +8,7 @@ import org.junit.jupiter.api.DynamicTest
 import org.junit.jupiter.api.TestFactory
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+import kotlin.test.Test
 
 class ContentTitleTest {
 
@@ -51,4 +52,10 @@ class ContentTitleTest {
         val section = Section(Format.AsciiDoc, content)
         assertThat(section.contentTitle()).isEqualTo("header")
     }
+
+    @Test
+    fun `with asciidoc heading including logo`() {
+        val section = Section(Format.AsciiDoc, "= image:logo.png[logo] header")
+        assertThat(section.contentTitle()).isEqualTo("header")
+    }
 }