Add request and response object to reactive view

docs/src/orchid/resources/changelog/v3_1_4.md

@@ -5,4 +5,5 @@ version: '3.1.4'
 - Slice filter: Use collection size when toIndex is greater than collection size  (#504)
 - Adjust spring boot doc (#509) 
 - Build with jdk14 (#508)
-- Set proxyBeanMethods to false (#507)
+- Set proxyBeanMethods to false (#507)
+- Add access to Spring Beans/request and response when using Pebble with WebFlux (#512)

pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java

@@ -31,4 +31,9 @@ public String beans() {
     return "beans";
   }
 
+  @RequestMapping("/response.action")
+  public String response() {
+    return "responseObject";
+  }
+
 }

pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java

@@ -36,7 +36,7 @@ void testRequestAccess() throws Exception {
         .expectBody(String.class)
         .returnResult().getResponseBody();
 
-    assertThat(result).isEqualTo("ctx path:");
+    assertThat(result).isEqualTo("ctx path:/contextPath.action");
   }
 
   @Test
@@ -85,5 +85,16 @@ void testBeansAccess() throws Exception {
 
     assertThat(result).isEqualTo("beans:bar");
   }
+
+  @Test
+  void testResponseAccess() throws Exception {
+    String result = this.client.get().uri("/response.action").exchange()
+        .expectStatus().isOk()
+        .expectHeader().contentTypeCompatibleWith(MediaType.TEXT_HTML)
+        .expectBody(String.class)
+        .returnResult().getResponseBody();
+
+    assertThat(result).isEqualTo("response:200 OK");
+  }
 }
 

pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java

@@ -78,4 +78,11 @@ void testBeansAccess() throws Exception {
         .andExpect(content().string("beans:bar"));
   }
 
+  @Test
+  void testResponseAccess() throws Exception {
+    this.mockMvc.perform(get("/response.action"))
+        .andExpect(status().isOk())
+        .andExpect(content().contentTypeCompatibleWith(MediaType.TEXT_HTML))
+        .andExpect(content().string("response:200"));
+  }
 }

pebble-spring/pebble-spring-boot-starter/src/test/resources/templates/contextPath.pebble

@@ -1 +1 @@
-ctx path:{{request.contextPath}}
+ctx path:{{request.contextPath}}{{request.path}}

pebble-spring/pebble-spring-boot-starter/src/test/resources/templates/responseObject.pebble

@@ -0,0 +1 @@
+response:{{response.status}}{{response.statusCode}}

pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java

@@ -26,6 +26,8 @@
 public class PebbleReactiveView extends AbstractUrlBasedView {
 
   private static final String BEANS_VARIABLE_NAME = "beans";
+  private static final String REQUEST_VARIABLE_NAME = "request";
+  private static final String RESPONSE_VARIABLE_NAME = "response";
 
   private PebbleEngine pebbleEngine;
   private String templateName;
@@ -48,7 +50,7 @@ protected Mono<Void> renderInternal(Map<String, Object> renderAttributes,
     try {
       Charset charset = this.getCharset(contentType);
       Writer writer = new OutputStreamWriter(dataBuffer.asOutputStream(), charset);
-      this.addVariablesToModel(renderAttributes);
+      this.addVariablesToModel(renderAttributes, exchange);
       this.evaluateTemplate(renderAttributes, locale, writer);
     } catch (Exception ex) {
       DataBufferUtils.release(dataBuffer);
@@ -57,8 +59,10 @@ protected Mono<Void> renderInternal(Map<String, Object> renderAttributes,
     return exchange.getResponse().writeWith(Flux.just(dataBuffer));
   }
 
-  private void addVariablesToModel(Map<String, Object> model) {
+  private void addVariablesToModel(Map<String, Object> model, ServerWebExchange exchange) {
     model.put(BEANS_VARIABLE_NAME, new Beans(this.getApplicationContext()));
+    model.put(REQUEST_VARIABLE_NAME, exchange.getRequest());
+    model.put(RESPONSE_VARIABLE_NAME, exchange.getResponse());
   }
 
   private Charset getCharset(@Nullable MediaType mediaType) {