release: v0.8.2 Thymeleaf Tag Processor now uses the Thymeleaf ViewRe…

…solver to render nested ViewComponents allowing to use th:field
tschuehly · Jul 1, 2024 · a4dacd2 · a4dacd2
1 parent 61b6c99
commit a4dacd2
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -227,7 +227,7 @@ spring.view-component.local-development=true
     <summary>Gradle</summary>
 
 ```kotlin
-implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.1")
+implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.2")
 sourceSets {
     main {
         resources {
@@ -249,7 +249,7 @@ sourceSets {
     <dependency>
       <groupId>de.tschuehly</groupId>
       <artifactId>spring-view-component-thymeleaf</artifactId>
-      <version>0.8.1</version>
+      <version>0.8.2</version>
     </dependency>
   </dependencies>
   <build>
@@ -286,7 +286,7 @@ plugins {
     id("gg.jte.gradle") version("3.1.12")
 }
 
-implementation("de.tschuehly:spring-view-component-jte:0.8.1")
+implementation("de.tschuehly:spring-view-component-jte:0.8.2")
 
 jte{
     generate()
@@ -305,7 +305,7 @@ jte{
     <dependency>
       <groupId>de.tschuehly</groupId>
       <artifactId>spring-view-component-jte</artifactId>
-      <version>0.8.1</version>
+      <version>0.8.2</version>
     </dependency>
   </dependencies>
   <build>
@@ -343,7 +343,7 @@ jte{
     <summary>Gradle</summary>
 
 ```kotlin
-implementation("de.tschuehly:spring-view-component-kte:0.8.1")
+implementation("de.tschuehly:spring-view-component-kte:0.8.2")
 jte{
     generate()
     sourceDirectory = Path("src/main/kotlin")

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
     kotlin("plugin.spring") version "1.9.23"
 
     id("maven-publish")
-    id("org.jreleaser") version "1.11.0"
+    id("org.jreleaser") version "1.13.1"
     id("signing")
     id("java-test-fixtures")
 }
 
 group = "de.tschuehly"
-version = "0.8.1"
+version = "0.8.2"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {

diff --git a/core/src/testFixtures/kotlin/de/tschuehly/spring/viewcomponent/core/IntegrationTestBase.kt b/core/src/testFixtures/kotlin/de/tschuehly/spring/viewcomponent/core/IntegrationTestBase.kt
@@ -8,9 +8,11 @@ import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+
 abstract class IntegrationTestBase {
     @Autowired
     lateinit var testRestTemplate: TestRestTemplate
+
     @Test
     fun testIndexComponent() {
         val expectedHtml =
@@ -37,6 +39,9 @@ abstract class IntegrationTestBase {
             <div>
                 <h2>This is the SimpleViewComponent</h2>
                 <div>Hello World</div>
+                <div>
+                  <input id="helloWorld" name="helloWorld" value="Hello World">
+                </div>
             </div>
         """.trimIndent()
         assertEndpointReturns("/simple", expectedHtml)
@@ -45,34 +50,35 @@ abstract class IntegrationTestBase {
     @Test
     fun testLayoutComponent() {
         //language=html
-        val expectedHtml =
-            """
+        val expectedHtml = """
                 <html>
                 <nav>This is a Navbar</nav>
                 <body>
                 <div><h2>This is the SimpleViewComponent</h2>
-                <div>Hello World</div></div></body>
-                <footer>This is a footer</footer></html>
+                  <div>Hello World</div>
+                  <div>
+                    <input id="helloWorld" name="helloWorld" value="Hello World">
+                  </div>
+                </div>
+                </body>
+                <footer>This is a footer</footer>
+                </html>
                             """.trimIndent()
         assertEndpointReturns("/layout", expectedHtml)
     }
 
     fun assertEndpointReturns(url: String, expectedHtml: String) {
-        val response: ResponseEntity<String> = this.testRestTemplate
-            .exchange(url, HttpMethod.GET, null, String::class.java)
-        assertThat(response.statusCode)
-            .isEqualTo(HttpStatus.OK)
+        val response: ResponseEntity<String> =
+            this.testRestTemplate.exchange(url, HttpMethod.GET, null, String::class.java)
+        assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
         Assertions.assertEquals(
             expectedHtml.rmWhitespaceBetweenHtmlTags(), response.body?.rmWhitespaceBetweenHtmlTags()
         )
     }
 
     fun String.rmWhitespaceBetweenHtmlTags(): String {
         // Replace whitespace between > and word
-        return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(), "")
-            .replace("(?<=\\w)(\\s*)(?=<)".toRegex(), "")
-            .replace("(?<=>)(\\s*)(?=<)".toRegex(), "")
-            .replace("\r\n","\n")
-            .trim()
+        return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(), "").replace("(?<=\\w)(\\s*)(?=<)".toRegex(), "")
+            .replace("(?<=>)(\\s*)(?=<)".toRegex(), "").replace("\r\n", "\n").trim()
     }
 }
diff --git a/examples/.run/Run all example tests.run.xml b/examples/.run/Run all example tests.run.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/examples" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
+      <option name="scriptParameters" value="--stacktrace --stacktrace --stacktrace --stacktrace" />
       <option name="taskDescriptions">
         <list />
       </option>

diff --git a/examples/jte-example/build.gradle.kts b/examples/jte-example/build.gradle.kts
@@ -26,14 +26,14 @@ repositories {
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
 
-    implementation("de.tschuehly:spring-view-component-jte:0.8.1")
+    implementation("de.tschuehly:spring-view-component-jte:0.8.2")
 
     implementation("org.webjars.npm:htmx.org:1.9.11")
     implementation("org.webjars:webjars-locator-core:0.58")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testRuntimeOnly("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.1"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.2"))
 }
 
 tasks.withType<Test> {

diff --git a/examples/jte-example/pom.xml b/examples/jte-example/pom.xml
@@ -15,7 +15,7 @@
 	<description>JTE Example</description>
 	<properties>
 		<java.version>17</java.version>
-		<view.component.version>0.8.1</view.component.version>
+		<view.component.version>0.8.2</view.component.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/...les/jte-example/src/main/java/de/tschuehly/example/jte/web/simple/SimpleViewComponent.jte b/...les/jte-example/src/main/java/de/tschuehly/example/jte/web/simple/SimpleViewComponent.jte
@@ -3,4 +3,7 @@
 <div>
   <h2>This is the SimpleViewComponent</h2>
   <div>${simpleView.helloWorld()}</div>
+  <div>
+    <input id="helloWorld" name="helloWorld" value="${simpleView.helloWorld()}">
+  </div>
 </div>
diff --git a/examples/kte-example/build.gradle.kts b/examples/kte-example/build.gradle.kts
@@ -31,8 +31,8 @@ repositories {
 }
 
 dependencies {
-    implementation("de.tschuehly:spring-view-component-kte:0.8.1")
-    implementation("de.tschuehly:spring-view-component-core:0.8.1")
+    implementation("de.tschuehly:spring-view-component-kte:0.8.2")
+    implementation("de.tschuehly:spring-view-component-core:0.8.2")
     implementation("io.github.wimdeblauwe:htmx-spring-boot:3.1.1")
 
     implementation("org.webjars.npm:htmx.org:1.9.11")
@@ -47,7 +47,7 @@ dependencies {
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.1"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.2"))
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/...e/src/main/kotlin/de/tschuehly/kteviewcomponentexample/web/simple/SimpleViewComponent.kte b/...e/src/main/kotlin/de/tschuehly/kteviewcomponentexample/web/simple/SimpleViewComponent.kte
@@ -2,4 +2,7 @@
 <div>
     <h2>This is the SimpleViewComponent</h2>
     <div>${simpleView.helloWorld}</div>
+    <div>
+        <input id="helloWorld" name="helloWorld" value="${simpleView.helloWorld}">
+    </div>
 </div>
diff --git a/examples/thymeleaf-java-example/build.gradle.kts b/examples/thymeleaf-java-example/build.gradle.kts
@@ -29,14 +29,14 @@ repositories {
 
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.1")
+    implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.2")
 
     implementation("org.webjars.npm:htmx.org:1.9.11")
     implementation("org.webjars:webjars-locator-core:0.58")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.1"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.2"))
 }
 
 tasks.withType<Test> {

diff --git a/examples/thymeleaf-java-example/pom.xml b/examples/thymeleaf-java-example/pom.xml
@@ -15,7 +15,7 @@
 	<description>Thymeleaf Java Example</description>
 	<properties>
 		<java.version>17</java.version>
-		<view.component.version>0.8.1</view.component.version>
+		<view.component.version>0.8.2</view.component.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/...mple/src/main/java/de/tschuehly/example/thymeleafjava/web/simple/SimpleViewComponent.html b/...mple/src/main/java/de/tschuehly/example/thymeleafjava/web/simple/SimpleViewComponent.html
@@ -2,4 +2,8 @@
   <h2>This is the SimpleViewComponent</h2>
   <!--/*@thymesVar id="simpleView" type="de.tschuehly.example.thymeleafjava.web.simple.SimpleViewComponent.SimpleView"*/-->
   <div th:text="${simpleView.helloWorld()}"></div>
+
+  <div th:object="${simpleView}">
+    <input th:field="*{helloWorld}">
+  </div>
 </div>
diff --git a/examples/thymeleaf-kotlin-example/build.gradle.kts b/examples/thymeleaf-kotlin-example/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
 }
 
 dependencies {
-    implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.1")
-    implementation("de.tschuehly:spring-view-component-core:0.8.1")
+    implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.2")
+    implementation("de.tschuehly:spring-view-component-core:0.8.2")
 
     implementation("org.webjars.npm:htmx.org:1.9.2")
     implementation("org.webjars:webjars-locator:0.47")
@@ -35,7 +35,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     testImplementation("org.springframework.boot:spring-boot-devtools")
-    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.1"))
+    testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.2"))
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/.../src/main/kotlin/de/tschuehly/example/thymeleafkotlin/web/simple/SimpleViewComponent.html b/.../src/main/kotlin/de/tschuehly/example/thymeleafkotlin/web/simple/SimpleViewComponent.html
@@ -2,4 +2,7 @@
   <h2>This is the SimpleViewComponent</h2>
   <!--/*@thymesVar id="simpleView" type="de.tschuehly.example.thymeleafkotlin.web.simple.SimpleViewComponent.SimpleView"*/-->
   <div th:text="${simpleView.helloWorld}"></div>
+  <div th:object="${simpleView}">
+    <input th:field="*{helloWorld}">
+  </div>
 </div>
diff --git a/jte/build.gradle.kts b/jte/build.gradle.kts
@@ -8,12 +8,12 @@ plugins {
     kotlin("plugin.spring") version "1.9.23"
 
     id("maven-publish")
-    id("org.jreleaser") version "1.11.0"
+    id("org.jreleaser") version "1.13.1"
     id("signing")
 }
 
 group = "de.tschuehly"
-version = "0.8.1"
+version = "0.8.2"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
@@ -22,7 +22,7 @@ repositories {
 }
 dependencies {
     api("gg.jte:jte:3.1.12")
-    api("de.tschuehly:spring-view-component-core:0.8.1")
+    api("de.tschuehly:spring-view-component-core:0.8.2")
 
     implementation("gg.jte:jte-spring-boot-starter-3:3.1.12")
     implementation("org.springframework.boot:spring-boot-starter-web")

diff --git a/kte/build.gradle.kts b/kte/build.gradle.kts
@@ -8,20 +8,20 @@ plugins {
     kotlin("plugin.spring") version "1.9.23"
 
     id("maven-publish")
-    id("org.jreleaser") version "1.11.0"
+    id("org.jreleaser") version "1.13.1"
     id("signing")
 }
 
 group = "de.tschuehly"
-version = "0.8.1"
+version = "0.8.2"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
 }
 dependencies {
     api("gg.jte:jte-kotlin:3.1.12")
-    api("de.tschuehly:spring-view-component-core:0.8.1")
+    api("de.tschuehly:spring-view-component-core:0.8.2")
 
     implementation("gg.jte:jte-spring-boot-starter-3:3.1.12")
     implementation("org.springframework.boot:spring-boot-starter-web")

diff --git a/thymeleaf/build.gradle.kts b/thymeleaf/build.gradle.kts
@@ -8,20 +8,20 @@ plugins {
 	kotlin("plugin.spring") version "1.9.23"
 
 	id("maven-publish")
-	id("org.jreleaser") version "1.5.1"
+	id("org.jreleaser") version "1.13.1"
 	id("signing")
 }
 
 group = "de.tschuehly"
-version = "0.8.1"
+version = "0.8.2"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
 	mavenCentral()
 }
 
 dependencies {
-	api("de.tschuehly:spring-view-component-core:0.8.1")
+	api("de.tschuehly:spring-view-component-core:0.8.2")
 	api("org.springframework.boot:spring-boot-devtools")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")

diff --git a/...in/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentAutoConfiguration.kt b/...in/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentAutoConfiguration.kt
@@ -3,9 +3,9 @@ package de.tschuehly.spring.viewcomponent.thymeleaf
 import de.tschuehly.spring.viewcomponent.core.ViewComponentAutoConfiguration
 import de.tschuehly.spring.viewcomponent.core.component.ViewComponentProperties
 import org.springframework.beans.factory.ObjectProvider
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafProperties
+import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
@@ -26,7 +26,8 @@ class ThymeleafViewComponentAutoConfiguration {
     fun templateEngine(
         properties: ThymeleafProperties,
         templateResolvers: ObjectProvider<ITemplateResolver>,
-        dialects: ObjectProvider<IDialect>
+        dialects: ObjectProvider<IDialect>,
+        applicationContext: ApplicationContext
     ): SpringTemplateEngine {
         val engine = SpringTemplateEngine()
         engine.enableSpringELCompiler = properties.isEnableSpringElCompiler
@@ -41,7 +42,7 @@ class ThymeleafViewComponentAutoConfiguration {
                 dialect
             )
         }
-        engine.addDialect(ThymeleafViewComponentDialect())
+        engine.addDialect(ThymeleafViewComponentDialect(applicationContext))
         return engine
     }
 

diff --git a/.../main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentDialect.kt b/.../main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentDialect.kt
@@ -1,15 +1,16 @@
 package de.tschuehly.spring.viewcomponent.thymeleaf
 
+import org.springframework.context.ApplicationContext
 import org.thymeleaf.dialect.AbstractProcessorDialect
 import org.thymeleaf.processor.IProcessor
 import org.thymeleaf.standard.StandardDialect
 
-class ThymeleafViewComponentDialect : AbstractProcessorDialect(
+class ThymeleafViewComponentDialect(private val applicationContext: ApplicationContext) : AbstractProcessorDialect(
     "ViewComponent Dialect", "view", StandardDialect.PROCESSOR_PRECEDENCE
 ) {
     override fun getProcessors(dialectPrefix: String): MutableSet<IProcessor> {
         return mutableSetOf(
-            ThymeleafViewComponentTagProcessor(dialectPrefix)
+            ThymeleafViewComponentTagProcessor(dialectPrefix,applicationContext)
         )
 
     }