add env.locale() fix jooby-project#249

jknack · jknack · commit 438152df836e · 2015-12-22T21:44:58.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/pebble/PebbleFeature.java b/coverage-report/src/test/java/org/jooby/pebble/PebbleFeature.java
@@ -0,0 +1,22 @@
+package org.jooby.hbs;
+
+import org.jooby.Results;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class HbsFeature extends ServerFeature {
+
+  {
+    use(new Hbs());
+
+    get("/", req -> Results.html("org/jooby/hbs/index").put("model", req.param("model").value()));
+  }
+
+  @Test
+  public void hbs() throws Exception {
+    request()
+        .get("/?model=jooby")
+        .expect("<html><title>/org/jooby/hbs/index.html:org/jooby/hbs/index</title><body>jooby</body></html>");
+  }
+
+}
diff --git a/jooby/src/main/java/org/jooby/Env.java b/jooby/src/main/java/org/jooby/Env.java
@@ -21,6 +21,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
+import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -69,14 +70,26 @@ interface Builder {
      * @param config A config instance.
      * @return A new environment.
      */
-    Env build(Config config);
+    default Env build(final Config config) {
+      return build(config, Locale.getDefault());
+    }
 
+    /**
+     * Build a new environment from a {@link Config} object. The environment is created from the
+     * <code>application.env</code> property. If such property is missing, env's name must be:
+     * <code>dev</code>.
+     *
+     * @param config A config instance.
+     * @param locale App locale.
+     * @return A new environment.
+     */
+    Env build(Config config, Locale locale);
   }
 
   /**
    * Default builder.
    */
-  Env.Builder DEFAULT = config -> {
+  Env.Builder DEFAULT = (config, locale) -> {
     requireNonNull(config, "A config is required.");
     String name = config.hasPath("application.env") ? config.getString("application.env") : "dev";
     return new Env() {
@@ -91,6 +104,11 @@ public Config config() {
         return config;
       }
 
+      @Override
+      public Locale locale() {
+        return locale;
+      }
+
       @Override
       public String toString() {
         return name();
@@ -108,6 +126,8 @@ public String toString() {
    */
   Config config();
 
+  Locale locale();
+
   /**
    * Returns a string with all substitutions (the <code>${foo.bar}</code> syntax,
    * see <a href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
@@ -134,7 +154,8 @@ default String resolve(final String text) {
    * @param endDelimiter End delimiter.
    * @return A processed string.
    */
-  default String resolve(final String text, final String startDelimiter, final String endDelimiter) {
+  default String resolve(final String text, final String startDelimiter,
+      final String endDelimiter) {
     return resolve(text, config(), startDelimiter, endDelimiter);
   }
 
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
@@ -3092,13 +3092,13 @@ private Injector bootstrap() throws Exception {
             .orElseGet(
                 () -> ConfigFactory.parseResources("application.conf")));
 
-    Env env = this.env.build(config);
+    final Locale locale = LocaleUtils.toLocale(config.getString("application.lang"));
+
+    Env env = this.env.build(config, locale);
     String envname = env.name();
 
     final Charset charset = Charset.forName(config.getString("application.charset"));
 
-    final Locale locale = LocaleUtils.toLocale(config.getString("application.lang"));
-
     String dateFormat = config.getString("application.dateFormat");
     ZoneId zoneId = ZoneId.of(config.getString("application.tz"));
     DateTimeFormatter dateTimeFormatter = DateTimeFormatter
diff --git a/jooby/src/test/java/org/jooby/JoobyTest.java b/jooby/src/test/java/org/jooby/JoobyTest.java
@@ -661,7 +661,7 @@ public void customEnv() throws Exception {
           expect(env.name()).andReturn("dev").times(2);
 
           Env.Builder builder = unit.get(Env.Builder.class);
-          expect(builder.build(isA(Config.class))).andReturn(env);
+          expect(builder.build(isA(Config.class), isA(Locale.class))).andReturn(env);
 
           Binder binder = unit.get(Binder.class);
 
