minor improvements

jknack · jknack · commit f2d97bd1181a · 2015-07-26T19:01:30.000-03:00
* add .contextPath to Request
* view engine now export _vname and _vpath variables (useful for debugging)
diff --git a/coverage-report/src/test/java/org/jooby/RequestContextPathFeature.java b/coverage-report/src/test/java/org/jooby/RequestContextPathFeature.java
@@ -0,0 +1,34 @@
+package org.jooby;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class RequestContextPathFeature extends ServerFeature {
+
+  {
+    use(ConfigFactory.empty().withValue("application.path", ConfigValueFactory.fromAnyRef("/x")));
+
+    get("/hello", req -> req.contextPath() + req.path());
+
+    get("/u/p:id", req -> req.contextPath() + req.path());
+
+  }
+
+  @Test
+  public void requestPath() throws Exception {
+    request()
+        .get("/x/hello")
+        .expect("/x/hello");
+  }
+
+  @Test
+  public void varRequestPath() throws Exception {
+    request()
+        .get("/x/u/p1")
+        .expect("/x/u/p1");
+  }
+
+}
diff --git a/coverage-report/src/test/java/org/jooby/RequestPathFeature.java b/coverage-report/src/test/java/org/jooby/RequestPathFeature.java
@@ -7,9 +7,9 @@ public class RequestPathFeature extends ServerFeature {
 
   {
 
-    get("/hello", (req, rsp) -> rsp.send(req.path()));
+    get("/hello", req -> req.contextPath() + req.path());
 
-    get("/u/p:id", (req, rsp) -> rsp.send(req.path()));
+    get("/u/p:id", req -> req.contextPath() + req.path());
 
   }
 
diff --git a/coverage-report/src/test/java/org/jooby/ftl/FtlFeature.java b/coverage-report/src/test/java/org/jooby/ftl/FtlFeature.java
@@ -16,7 +16,7 @@ public class FtlFeature extends ServerFeature {
   public void freemarker() throws Exception {
     request()
         .get("/?model=jooby")
-        .expect("<html><body>jooby</body></html>");
+        .expect("<html>org/jooby/ftl/index.html:org/jooby/ftl/index<body>jooby</body></html>");
   }
 
 }
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsCustomFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsCustomFeature.java
@@ -20,7 +20,7 @@ public class HbsCustomFeature extends ServerFeature {
   public void hbs() throws Exception {
     request()
         .get("/?model=jooby")
-        .expect("<html><body>jooby</body></html>");
+        .expect("<html><title>/org/jooby/hbs/index.html:index</title><body>jooby</body></html>");
   }
 
 }
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsCustomValueResolverFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsCustomValueResolverFeature.java
@@ -40,7 +40,7 @@ public Set<Entry<String, Object>> propertySet(final Object context) {
   public void shouldInjectHelpers() throws Exception {
     request()
         .get("/")
-        .expect("<html><body>VR</body></html>");
+        .expect("<html><title>VR:VR</title><body>VR</body></html>");
   }
 
 }
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsFeature.java
@@ -16,7 +16,7 @@ public class HbsFeature extends ServerFeature {
   public void hbs() throws Exception {
     request()
         .get("/?model=jooby")
-        .expect("<html><body>jooby</body></html>");
+        .expect("<html><title>/org/jooby/hbs/index.html:org/jooby/hbs/index</title><body>jooby</body></html>");
   }
 
 }
diff --git a/coverage-report/src/test/resources/org/jooby/ftl/index.html b/coverage-report/src/test/resources/org/jooby/ftl/index.html
@@ -1 +1 @@
-<html><body>${model}</body></html>
+<html>${_vpath}:${_vname}<body>${model}</body></html>
diff --git a/coverage-report/src/test/resources/org/jooby/hbs/index.html b/coverage-report/src/test/resources/org/jooby/hbs/index.html
@@ -1 +1 @@
-<html><body>{{model}}</body></html>
+<html><title>{{_vpath}}:{{_vname}}</title><body>{{model}}</body></html>
diff --git a/jooby-ftl/src/main/java/org/jooby/internal/ftl/Engine.java b/jooby-ftl/src/main/java/org/jooby/internal/ftl/Engine.java
@@ -55,6 +55,9 @@ public void render(final View view, final Renderer.Context ctx) throws Exception
 
     Map<String, Object> hash = new HashMap<>();
 
+    hash.put("_vname", view.name());
+    hash.put("_vpath", template.getName());
+
     // locals
     hash.putAll(ctx.locals());
 
diff --git a/jooby-hbs/src/main/java/org/jooby/internal/hbs/HbsEngine.java b/jooby-hbs/src/main/java/org/jooby/internal/hbs/HbsEngine.java
@@ -20,13 +20,16 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.Map;
+
 import org.jooby.MediaType;
 import org.jooby.Renderer;
 import org.jooby.View;
 
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Template;
 import com.github.jknack.handlebars.ValueResolver;
+import com.github.jknack.handlebars.io.TemplateSource;
 
 public class HbsEngine implements View.Engine {
 
@@ -41,12 +44,18 @@ public HbsEngine(final Handlebars handlebars, final ValueResolver[] resolvers) {
 
   @Override
   public void render(final View view, final Renderer.Context ctx) throws Exception {
-    Template template = handlebars.compile(view.name());
+    String vname = view.name();
+    TemplateSource source = handlebars.getLoader().sourceAt(vname);
+    Template template = handlebars.compile(source);
+
+    Map<String, Object> locals = ctx.locals();
+    locals.putIfAbsent("_vname", vname);
+    locals.putIfAbsent("_vpath", source.filename());
 
     com.github.jknack.handlebars.Context context = com.github.jknack.handlebars.Context
         .newBuilder(view.model())
         // merge request locals (req+sessions locals)
-        .combine(ctx.locals())
+        .combine(locals)
         .resolver(resolvers)
         .build();
 
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -66,6 +66,11 @@ public String path() {
       return req.path();
     }
 
+    @Override
+    public String contextPath() {
+      return req.contextPath();
+    }
+
     @Override
     public String method() {
       return req.method();
@@ -300,6 +305,14 @@ default String path() {
     return route().path();
   }
 
+  /**
+   * Application path (a.k.a context path). It is the value defined by:
+   * <code>application.path</code>. Default is: <code>/</code>
+   *
+   * @return Application context path..
+   */
+  String contextPath();
+
   /**
    * @return HTTP method.
    */
@@ -358,7 +371,7 @@ default Optional<MediaType> accepts(final String... types) {
    * @param types Types to test
    * @return True if any of the given type is accepted.
    */
-  default boolean is(final String ... types) {
+  default boolean is(final String... types) {
     return accepts(types).isPresent();
   }
 
@@ -482,8 +495,8 @@ default Optional<MediaType> accepts(final MediaType... types) {
    * <pre>
    *  assertEquals("jooby", req.param(name).value());
    *
-   *  assertEquals("jooby", req.param(name).toList(String.class).get(0));
-   *  assertEquals("rocks", req.param(name).toList(String.class).get(1));
+   *  assertEquals("jooby", req.param(name).toList().get(0));
+   *  assertEquals("rocks", req.param(name).toList().get(1));
    * </pre>
    *
    * Uploads can be retrieved too when <code>Content-Type</code> is <code>multipart/form-data</code>
diff --git a/jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java b/jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java
@@ -128,15 +128,17 @@ public void handle(final NativeRequest request, final NativeResponse response) t
       resolveAs404 = true;
     }
 
+    String contextPath = "/".equals(applicationPath) ? "" : applicationPath;
     // default locals
-    locals.put("contextPath", "/".equals(applicationPath) ? "" : applicationPath);
+    locals.put("contextPath", contextPath);
     locals.put("path", requestPath);
 
     final String path = verb + requestPath;
 
     Route notFound = RouteImpl.notFound(verb, path, MediaType.ALL);
 
-    RequestImpl req = new RequestImpl(injector, request, port, notFound, scope, locals);
+    RequestImpl req = new RequestImpl(injector, request, contextPath, port, notFound, scope,
+        locals);
 
     ResponseImpl rsp = new ResponseImpl(injector, response, notFound, locals,
         req.charset(), request.header("Referer"));
diff --git a/jooby/src/main/java/org/jooby/internal/RequestImpl.java b/jooby/src/main/java/org/jooby/internal/RequestImpl.java
@@ -82,8 +82,10 @@ public class RequestImpl implements Request {
 
   private int port;
 
+  private String contextPath;
+
   public RequestImpl(final Injector injector,
-      final NativeRequest req,
+      final NativeRequest req, final String contextPath,
       final int port, final Route route,
       final Map<Object, Object> scope,
       final Map<String, Object> locals) {
@@ -93,6 +95,8 @@ public RequestImpl(final Injector injector,
     this.scope = requireNonNull(scope, "Scope is required.");
     this.locals = requireNonNull(locals, "Request locals are required.");
 
+    this.contextPath = contextPath;
+
     this.accept = findAccept(req);
 
     this.locale = findLocale(req, injector.getInstance(Locale.class));
@@ -110,6 +114,11 @@ public RequestImpl(final Injector injector,
     this.files = new ArrayList<>();
   }
 
+  @Override
+  public String contextPath() {
+    return contextPath;
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public <T> Optional<T> get(final String name) {
diff --git a/jooby/src/test/java/org/jooby/RequestForwardingTest.java b/jooby/src/test/java/org/jooby/RequestForwardingTest.java
@@ -49,6 +49,18 @@ public void path() throws Exception {
         });
   }
 
+  @Test
+  public void cpath() throws Exception {
+    new MockUnit(Request.class)
+        .expect(unit -> {
+          Request req = unit.get(Request.class);
+          expect(req.contextPath()).andReturn("");
+        })
+        .run(unit -> {
+          assertEquals("", new Request.Forwarding(unit.get(Request.class)).contextPath());
+        });
+  }
+
   @Test
   public void verb() throws Exception {
     new MockUnit(Request.class)
diff --git a/jooby/src/test/java/org/jooby/RequestTest.java b/jooby/src/test/java/org/jooby/RequestTest.java
@@ -30,6 +30,11 @@ public List<MediaType> accept() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public String contextPath() {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public Optional<MediaType> accepts(final List<MediaType> types) {
       throw new UnsupportedOperationException();

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public class RequestPathFeature extends ServerFeature {`
`7`	`7`
`8`	`8`	`{`
`9`	`9`
`10`		`- get("/hello", (req, rsp) -> rsp.send(req.path()));`
	`10`	`+ get("/hello", req -> req.contextPath() + req.path());`
`11`	`11`
`12`		`- get("/u/p:id", (req, rsp) -> rsp.send(req.path()));`
	`12`	`+ get("/u/p:id", req -> req.contextPath() + req.path());`
`13`	`13`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class FtlFeature extends ServerFeature {`
`16`	`16`	`public void freemarker() throws Exception {`
`17`	`17`	`request()`
`18`	`18`	`.get("/?model=jooby")`
`19`		`- .expect("<html><body>jooby</body></html>");`
	`19`	`+ .expect("<html>org/jooby/ftl/index.html:org/jooby/ftl/index<body>jooby</body></html>");`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class HbsCustomFeature extends ServerFeature {`
`20`	`20`	`public void hbs() throws Exception {`
`21`	`21`	`request()`
`22`	`22`	`.get("/?model=jooby")`
`23`		`- .expect("<html><body>jooby</body></html>");`
	`23`	`+ .expect("<html><title>/org/jooby/hbs/index.html:index</title><body>jooby</body></html>");`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Set<Entry<String, Object>> propertySet(final Object context) {`
`40`	`40`	`public void shouldInjectHelpers() throws Exception {`
`41`	`41`	`request()`
`42`	`42`	`.get("/")`
`43`		`- .expect("<html><body>VR</body></html>");`
	`43`	`+ .expect("<html><title>VR:VR</title><body>VR</body></html>");`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class HbsFeature extends ServerFeature {`
`16`	`16`	`public void hbs() throws Exception {`
`17`	`17`	`request()`
`18`	`18`	`.get("/?model=jooby")`
`19`		`- .expect("<html><body>jooby</body></html>");`
	`19`	`+ .expect("<html><title>/org/jooby/hbs/index.html:org/jooby/hbs/index</title><body>jooby</body></html>");`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<html><body>${model}</body></html>`
	`1`	`+<html>${_vpath}:${_vname}<body>${model}</body></html>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<html><body>{{model}}</body></html>`
	`1`	`+<html><title>{{_vpath}}:{{_vname}}</title><body>{{model}}</body></html>`