Add Pebble request() function

resoluteworks · May 6, 2024 · 1a28399 · 1a28399
1 parent c11812c
commit 1a28399
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-invirtVersion = 0.8.27
+invirtVersion = 0.8.28
 kotlinVersion = 1.9.23
 http4kVersion = 5.17.0.0
 mockkVersion = 1.13.9

diff --git a/invirt-http4k/src/main/kotlin/invirt/pebble/InvirtPebbleExtension.kt b/invirt-http4k/src/main/kotlin/invirt/pebble/InvirtPebbleExtension.kt
@@ -23,7 +23,8 @@ class InvirtPebbleExtension : AbstractExtension() {
             jsonFunction,
             jsonArrayFunction,
 
-            // Request query
+            // Request
+            requestFunction,
             replaceQueryFunction,
             replacePageFunction,
             removeQueryValueFunction,

diff --git a/invirt-http4k/src/main/kotlin/invirt/pebble/functions/utils.kt b/invirt-http4k/src/main/kotlin/invirt/pebble/functions/utils.kt
@@ -13,3 +13,7 @@ val currencyFromMinorUnitFunction = pebbleFunction("currencyFromMinorUnit", "min
 val errorsFunction = pebbleFunction("errors") {
     validationErrorContextKey[currentHttp4kRequest!!]
 }
+
+val requestFunction = pebbleFunction("request") {
+    currentHttp4kRequest!!
+}
diff --git a/invirt-http4k/src/test/kotlin/invirt/pebble/PebbleFunctionsTest.kt b/invirt-http4k/src/test/kotlin/invirt/pebble/PebbleFunctionsTest.kt
@@ -2,11 +2,7 @@ package invirt.pebble
 
 import invirt.data.Page
 import invirt.http4k.StoreRequestOnThread
-import invirt.http4k.views.Views
-import invirt.http4k.views.ok
-import invirt.http4k.views.renderTemplate
-import invirt.http4k.views.setDefaultViewLens
-import invirt.http4k.views.withView
+import invirt.http4k.views.*
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.comparables.shouldBeGreaterThan
 import io.kotest.matchers.shouldBe
@@ -28,6 +24,18 @@ class PebbleFunctionsTest : StringSpec() {
             testFunction("today", "/test", "${LocalDate.now()}")
         }
 
+        "request" {
+            testFunction(
+                "request",
+                "/test?q=john",
+                """
+                   GET
+                   /test?q=john
+                   john
+                """.trimIndent()
+            )
+        }
+
         "replaceQuery" {
             testFunction("replaceQuery", "/test", "/test?from=10")
             testFunction("replaceQuery", "/test?from=5", "/test?from=10")

diff --git a/invirt-http4k/src/test/resources/webapp/views/function-request.peb b/invirt-http4k/src/test/resources/webapp/views/function-request.peb
@@ -0,0 +1,5 @@
+{{ request().method }}
+
+{{ request().uri }}
+
+{{ request().query("q") }}