Merge pull request #777 from jooby-project/765

Pebble template file not found if packaging into jar fix #765
jooby-project · May 21, 2017 · 7a288e0 · 7a288e0
2 parents 0e2f414 + 00c5f00
commit 7a288e0
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 1 deletion.
diff --git a/jooby-pebble/src/main/java/org/jooby/pebble/Pebble.java b/jooby-pebble/src/main/java/org/jooby/pebble/Pebble.java
@@ -142,7 +142,7 @@ public class Pebble implements Jooby.Module {
    * @param suffix Template extension.
    */
   public Pebble(final String prefix, final String suffix) {
-    this.pebble = new PebbleEngine.Builder().loader(loader(prefix, suffix));
+    this.pebble = new PebbleEngine.Builder().loader(loader(safePrefix(prefix), suffix));
   }
 
   /**
@@ -240,4 +240,14 @@ private static Loader<String> loader(final String prefix, final String suffix) {
     return loader;
   }
 
+  private static String safePrefix(final String prefix) {
+    if (prefix != null && prefix.length() > 0) {
+      if (prefix.startsWith("/")) {
+        String rewrite = prefix.substring(1);
+        return rewrite.length() == 0 ? null : rewrite;
+      }
+    }
+    return null;
+  }
+
 }
diff --git a/jooby-pebble/src/test/java/org/jooby/pebble/PebbleTest.java b/jooby-pebble/src/test/java/org/jooby/pebble/PebbleTest.java
@@ -107,6 +107,77 @@ public void basic() throws Exception {
         });
   }
 
+  @Test
+  public void prefixAsRoot() throws Exception {
+    Locale locale = Locale.getDefault();
+    new MockUnit(Env.class, Config.class, Binder.class, PebbleEngine.class)
+        .expect(defLoader)
+        .expect(newEngine)
+        .expect(env("dev", locale))
+        .expect(cacheStatic)
+        .expect(cache("pebble.cache", null))
+        .expect(cache(0))
+        .expect(cache("pebble.tagCache", null))
+        .expect(tagCache(0))
+        .expect(locale(locale))
+        .expect(build)
+        .expect(bindEngine)
+        .expect(renderer)
+        .run(unit -> {
+          new Pebble("/", ".html")
+              .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        });
+  }
+
+  @Test
+  public void emptyPrefix() throws Exception {
+    Locale locale = Locale.getDefault();
+    new MockUnit(Env.class, Config.class, Binder.class, PebbleEngine.class)
+        .expect(defLoader)
+        .expect(newEngine)
+        .expect(env("dev", locale))
+        .expect(cacheStatic)
+        .expect(cache("pebble.cache", null))
+        .expect(cache(0))
+        .expect(cache("pebble.tagCache", null))
+        .expect(tagCache(0))
+        .expect(locale(locale))
+        .expect(build)
+        .expect(bindEngine)
+        .expect(renderer)
+        .run(unit -> {
+          new Pebble("", ".html")
+              .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        });
+  }
+
+  @Test
+  public void noEmptyPrefix() throws Exception {
+    Locale locale = Locale.getDefault();
+    new MockUnit(Env.class, Config.class, Binder.class, PebbleEngine.class)
+        .expect(unit -> {
+          ClasspathLoader loader = unit.constructor(ClasspathLoader.class).build();
+          loader.setPrefix("views");
+          loader.setSuffix(".html");
+          unit.registerMock(ClasspathLoader.class, loader);
+        })
+        .expect(newEngine)
+        .expect(env("dev", locale))
+        .expect(cacheStatic)
+        .expect(cache("pebble.cache", null))
+        .expect(cache(0))
+        .expect(cache("pebble.tagCache", null))
+        .expect(tagCache(0))
+        .expect(locale(locale))
+        .expect(build)
+        .expect(bindEngine)
+        .expect(renderer)
+        .run(unit -> {
+          new Pebble("/views", ".html")
+              .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        });
+  }
+
   @Test
   public void proddef() throws Exception {
     Locale locale = Locale.getDefault();