API change: View model must be a Map and not any object fix jooby-project#47

jknack · jknack · commit 58915ba434e9 · 2015-03-17T21:21:21.000-03:00
before:

```java
  View.of("viewname", model); // where model was of anything
```

after:

```java
// view with empty model
View.of("viewname");

// view with a initial model attr
View.of("viewname", "model", model);

// view with model built incrementally
View.of("viewname")
  .put("model1", model1)
  .put("model2", model2);
```
diff --git a/coverage-report/src/test/java/org/jooby/ContentNegotiationFeature.java b/coverage-report/src/test/java/org/jooby/ContentNegotiationFeature.java
@@ -1,9 +1,5 @@
 package org.jooby;
 
-import org.jooby.Body;
-import org.jooby.MediaType;
-import org.jooby.Status;
-import org.jooby.View;
 import org.jooby.mvc.Consumes;
 import org.jooby.mvc.GET;
 import org.jooby.mvc.Path;
@@ -52,7 +48,7 @@ public String json() {
 
     get("/any", (req, resp) ->
         resp.format()
-            .when("text/html", () -> View.of("test", "body"))
+            .when("text/html", () -> View.of("test", "this", "body"))
             .when("*/*", () -> "body")
             .send());
 
@@ -63,11 +59,11 @@ public String json() {
 
     get("/like", (req, resp) ->
         resp.format()
-            .when("text/html", () -> View.of("test", "body"))
+            .when("text/html", () -> View.of("test", "this", "body"))
             .when("application/json", () -> "body")
             .send());
 
-    get("/html", (req, resp) -> resp.send(View.of("test", "body")))
+    get("/html", (req, resp) -> resp.send(View.of("test", "this", "body")))
         .produces(MediaType.html);
 
     get("/json", (req, resp) -> resp.send("body"))
@@ -84,35 +80,35 @@ public void chromeAccept() throws Exception {
     request()
         .get("/any")
         .header("Accept", CHROME_ACCEPT)
-        .expect("<html><body>test: body</body></html>");
+        .expect("<html><body>test: {this=body}</body></html>");
 
     request()
         .get("/r/any")
         .header("Accept", CHROME_ACCEPT)
-        .expect("<html><body>any: body</body></html>");
+        .expect("<html><body>any: {this=body}</body></html>");
   }
 
   @Test
   public void htmlAccept() throws Exception {
     request()
         .get("/any")
         .header("Accept", "text/html")
-        .expect("<html><body>test: body</body></html>");
+        .expect("<html><body>test: {this=body}</body></html>");
 
     request()
         .get("/r/any")
         .header("Accept", "text/html")
-        .expect("<html><body>any: body</body></html>");
+        .expect("<html><body>any: {this=body}</body></html>");
 
     request()
         .get("/html")
         .header("Accept", CHROME_ACCEPT)
-        .expect("<html><body>test: body</body></html>");
+        .expect("<html><body>test: {this=body}</body></html>");
 
     request()
         .get("/r/html")
         .header("Accept", CHROME_ACCEPT)
-        .expect("<html><body>html: body</body></html>");
+        .expect("<html><body>html: {this=body}</body></html>");
 
     request()
         .get("/json")
diff --git a/coverage-report/src/test/java/org/jooby/TemplateEngineFeature.java b/coverage-report/src/test/java/org/jooby/TemplateEngineFeature.java
@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 
-import org.jooby.Body;
-import org.jooby.View;
 import org.jooby.mvc.GET;
 import org.jooby.mvc.Path;
 import org.jooby.mvc.Viewable;
@@ -20,7 +18,7 @@ public static class Resource {
     @Path("/view")
     @GET
     public View view() throws IOException {
-      return View.of("test", "model");
+      return View.of("test", "this", "model");
     }
 
     @Path("/view/template")
@@ -39,7 +37,7 @@ public Object template() throws IOException {
     });
 
     get("/view", (req, resp) -> {
-      resp.send(View.of("test", "model"));
+      resp.send(View.of("test", "this", "model"));
     });
 
     use(Resource.class);
@@ -49,18 +47,18 @@ public Object template() throws IOException {
   public void view() throws Exception {
     request()
         .get("/view")
-        .expect("<html><body>test: model</body></html>");
+        .expect("<html><body>test: {this=model}</body></html>");
 
     request()
         .get("/r/view")
-        .expect("<html><body>test: model</body></html>");
+        .expect("<html><body>test: {this=model}</body></html>");
   }
 
   @Test
   public void templateAnnotation() throws Exception {
     request()
         .get("/r/view/template")
-        .expect("<html><body>template: model</body></html>");
+        .expect("<html><body>template: {this=model}</body></html>");
 
   }
 
diff --git a/coverage-report/src/test/java/org/jooby/ViewWithExplicitEngineFeature.java b/coverage-report/src/test/java/org/jooby/ViewWithExplicitEngineFeature.java
@@ -1,7 +1,6 @@
 package org.jooby;
 
 import org.jooby.Body.Writer;
-import org.jooby.View;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -37,7 +36,7 @@ public void render(final View viewable, final Writer writer) throws Exception {
 
     get("/:engine", (req, rsp) -> {
       String engine = req.param("engine").value();
-      rsp.send(View.of("view", new Object()).engine(engine));
+      rsp.send(View.of("view", "this", new Object()).engine(engine));
     });
 
   }
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsCacheOffFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsCacheOffFeature.java
@@ -2,7 +2,6 @@
 
 import static org.junit.Assert.assertSame;
 
-import org.jooby.hbs.Hbs;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -29,7 +28,7 @@ public class HbsCacheOffFeature extends ServerFeature {
   @Test
   public void hbs() throws Exception {
     request()
-        .get("/?model=jooby")
+        .get("/")
         .expect("noop");
   }
 
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsCustomFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsCustomFeature.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertSame;
 
 import org.jooby.View;
-import org.jooby.hbs.Hbs;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -16,7 +15,7 @@ public class HbsCustomFeature extends ServerFeature {
     Handlebars handlebars = new Handlebars(new ClassPathTemplateLoader("/org/jooby/hbs", ".html"));
     use(new Hbs(handlebars).doWith(h -> assertSame(handlebars, h)));
 
-    get("/", req -> View.of("index", req.param("model").value()));
+    get("/", req -> View.of("index", "model", req.param("model").value()));
   }
 
   @Test
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsFeature.java
@@ -1,7 +1,6 @@
 package org.jooby.hbs;
 
 import org.jooby.View;
-import org.jooby.hbs.Hbs;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -10,7 +9,7 @@ public class HbsFeature extends ServerFeature {
   {
     use(new Hbs());
 
-    get("/", req -> View.of("/org/jooby/hbs/index", req.param("model").value()));
+    get("/", req -> View.of("org/jooby/hbs/index", "model", req.param("model").value()));
   }
 
   @Test
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsNoCacheFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsNoCacheFeature.java
@@ -2,7 +2,6 @@
 
 import static org.junit.Assert.assertSame;
 
-import org.jooby.hbs.Hbs;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -23,7 +22,7 @@ public class HbsNoCacheFeature extends ServerFeature {
   @Test
   public void hbs() throws Exception {
     request()
-        .get("/?model=jooby")
+        .get("/")
         .expect("noop");
   }
 
diff --git a/coverage-report/src/test/java/org/jooby/hbs/HbsWithContextResultFeature.java b/coverage-report/src/test/java/org/jooby/hbs/HbsWithContextResultFeature.java
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue27.java b/coverage-report/src/test/java/org/jooby/issues/Issue27.java
@@ -18,13 +18,13 @@ public class Issue27 extends ServerFeature {
 
     get("*", (req, rsp) -> req.set("session", req.session()));
 
-    get("/config", req -> View.of("org/jooby/issues/27/config", new Object()));
+    get("/config", req -> View.of("org/jooby/issues/27/config", "this", new Object()));
 
-    get("/req", req -> View.of("org/jooby/issues/27/req", new Object()));
+    get("/req", req -> View.of("org/jooby/issues/27/req", "this", new Object()));
 
     get("/session", req -> {
       req.session().set("attr", "session-attr");
-      return View.of("org/jooby/issues/27/session", new Object());
+      return View.of("org/jooby/issues/27/session", "this", new Object());
     });
   }
 
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>{{this}}</body></html>
+<html><body>{{model}}</body></html>
diff --git a/jooby-hbs/src/main/java/org/jooby/hbs/Hbs.java b/jooby-hbs/src/main/java/org/jooby/hbs/Hbs.java
@@ -64,26 +64,19 @@ public String name() {
     public void render(final View view, final Body.Writer writer) throws Exception {
       Template template = handlebars.compile(view.name());
 
-      final Context context;
-      Object model = view.model();
-      if (model instanceof Context) {
-        context = (Context) model;
-      } else {
-        // build new context
-        context = Context
-            .newBuilder(model)
-            // merge request locals (req+sessions locals)
-            .combine(writer.locals())
-            .resolver(
-                MapValueResolver.INSTANCE,
-                JavaBeanValueResolver.INSTANCE,
-                MethodValueResolver.INSTANCE,
-                FieldValueResolver.INSTANCE,
-                new LocalsValueResolver(),
-                new ConfigValueResolver()
-            )
-            .build();
-      }
+      Context context = Context
+          .newBuilder(view.model())
+          // merge request locals (req+sessions locals)
+          .combine(writer.locals())
+          .resolver(
+              MapValueResolver.INSTANCE,
+              JavaBeanValueResolver.INSTANCE,
+              MethodValueResolver.INSTANCE,
+              FieldValueResolver.INSTANCE,
+              new LocalsValueResolver(),
+              new ConfigValueResolver()
+          )
+          .build();
 
       // rendering it
       writer.text(out -> template.apply(context, out));
@@ -111,10 +104,10 @@ public Hbs doWith(final Consumer<Handlebars> block) {
   };
 
   @Override
-  public void configure(final Env mode, final Config config, final Binder binder) {
+  public void configure(final Env env, final Config config, final Binder binder) {
 
     // cache
-    if ("dev".equals(mode.name()) || config.getString("hbs.cache").isEmpty()) {
+    if ("dev".equals(env.name()) || config.getString("hbs.cache").isEmpty()) {
       // noop cache
       hbs.with(NullTemplateCache.INSTANCE);
     } else {
@@ -131,7 +124,7 @@ public void configure(final Env mode, final Config config, final Binder binder)
     Multibinder.newSetBinder(binder, Body.Formatter.class).addBinding()
         .toInstance(engine);
 
-    // direct accessf
+    // direct access
     binder.bind(Key.get(View.Engine.class, Names.named(engine.name()))).toInstance(engine);
   }
 
diff --git a/jooby/src/main/java/org/jooby/Err.java b/jooby/src/main/java/org/jooby/Err.java
@@ -60,7 +60,7 @@ public void handle(final Request req, final Response rsp, final Exception ex)
       Map<String, Object> err = err(req, rsp, ex);
 
       rsp.format()
-          .when(MediaType.html, () -> View.of(errPage(req, rsp, ex), err))
+          .when(MediaType.html, () -> View.of(errPage(req, rsp, ex), "err", err))
           .when(MediaType.all, () -> err)
           .send();
     }
diff --git a/jooby/src/main/java/org/jooby/View.java b/jooby/src/main/java/org/jooby/View.java
diff --git a/jooby/src/test/java/org/jooby/DefaultErrHandlerTest.java b/jooby/src/test/java/org/jooby/DefaultErrHandlerTest.java
diff --git a/jooby/src/test/java/org/jooby/ViewEngineTest.java b/jooby/src/test/java/org/jooby/ViewEngineTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package org.jooby.hbs;`
`2`	`2`
`3`	`3`	`import org.jooby.View;`
`4`		`-import org.jooby.hbs.Hbs;`
`5`	`4`	`import org.jooby.test.ServerFeature;`
`6`	`5`	`import org.junit.Test;`
`7`	`6`
`@@ -10,7 +9,7 @@ public class HbsFeature extends ServerFeature {`
`10`	`9`	`{`
`11`	`10`	`use(new Hbs());`
`12`	`11`
`13`		`- get("/", req -> View.of("/org/jooby/hbs/index", req.param("model").value()));`
	`12`	`+ get("/", req -> View.of("org/jooby/hbs/index", "model", req.param("model").value()));`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<html><body>{{this}}</body></html>`
	`1`	`+<html><body>{{model}}</body></html>`