assets prefix fix #553

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue553.java

@@ -0,0 +1,35 @@
+package org.jooby.issues;
+
+import org.jooby.Results;
+import org.jooby.assets.Assets;
+import org.jooby.assets.AssetsBase;
+import org.jooby.hbs.Hbs;
+import org.junit.Test;
+
+public class Issue553 extends AssetsBase {
+
+  {
+
+    use(assets("dev",
+        "basedir", "org/jooby/assets",
+        "dev", hash("prefix", "https://foo.cdn.org"),
+        "fileset", hash("home", list("js/index.js", "css/index.css")), "watch", false));
+
+    use(new Hbs("/org/jooby/assets"));
+    use(new Assets());
+
+    get("/553", () -> Results.html("index"));
+  }
+
+  @Test
+  public void nopipeline() throws Exception {
+    request()
+        .get("/553")
+        .expect("[/org/jooby/assets/css/index.css]\n" +
+            "<link href=\"https://foo.cdn.org/org/jooby/assets/css/index.css\" rel=\"stylesheet\">\n" +
+            "\n" +
+            "[/org/jooby/assets/js/index.js]\n" +
+            "<script src=\"https://foo.cdn.org/org/jooby/assets/js/index.js\"></script>\n");
+  }
+
+}

jooby-assets/src/main/java/org/jooby/assets/Assets.java

@@ -18,6 +18,8 @@
  */
 package org.jooby.assets;
 
+import java.util.List;
+
 import org.jooby.Env;
 import org.jooby.Jooby;
 import org.jooby.Router;
@@ -26,6 +28,7 @@
 import org.jooby.internal.assets.AssetVars;
 import org.jooby.internal.assets.LiveCompiler;
 
+import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
@@ -301,14 +304,21 @@ public class Assets implements Jooby.Module {
 
   @Override
   public void configure(final Env env, final Config config, final Binder binder) throws Throwable {
-    boolean dev = "dev".equals(env.name());
+    String envname = env.name();
+    boolean dev = "dev".equals(envname);
     ClassLoader loader = getClass().getClassLoader();
     Config conf = conf(dev, loader, config);
     String cpath = config.getString("application.path");
     AssetCompiler compiler = new AssetCompiler(loader, conf);
 
     Router routes = env.router();
-    routes.use("*", "*", new AssetVars(compiler, cpath)).name("/assets/vars");
+    List<String> dist = dev ? ImmutableList.of("dev") : ImmutableList.of(envname, "dist");
+    String prefix = dist.stream()
+        .filter(it -> conf.hasPath("assets." + it + ".prefix"))
+        .findFirst()
+        .map(it -> conf.getString("assets." + it + ".prefix"))
+        .orElse(cpath);
+    routes.use("*", "*", new AssetVars(compiler, prefix, !dev)).name("/assets/vars");
     // live compiler?
     boolean watch = conf.hasPath("assets.watch") ? conf.getBoolean("assets.watch") : dev;
     if (watch) {

jooby-assets/src/main/java/org/jooby/internal/assets/AssetVars.java

@@ -19,40 +19,60 @@
 package org.jooby.internal.assets;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.jooby.Request;
 import org.jooby.Response;
 import org.jooby.Route;
 import org.jooby.assets.AssetCompiler;
 
+import javaslang.Function1;
+
 public class AssetVars implements Route.Handler {
 
   private AssetCompiler compiler;
 
   private String cpath;
 
-  public AssetVars(final AssetCompiler compiler, final String cpath) {
+  private Function1<String, List<String>> styles;
+  private Function1<String, List<String>> scripts;
+
+  public AssetVars(final AssetCompiler compiler, final String cpath, final boolean cache) {
     this.compiler = compiler;
     this.cpath = cpath.equals("/") ? "" : cpath;
+    styles = compiler::styles;
+    scripts = compiler::scripts;
+    if (cache) {
+      styles = styles.memoized();
+      scripts = scripts.memoized();
+    }
   }
 
   @Override
   public void handle(final Request req, final Response rsp) throws Exception {
     compiler.fileset().forEach(asset -> {
       /** Styles */
-      List<String> styles = compiler.styles(asset);
-      req.set(asset + "_css", styles);
-      req.set(asset + "_styles", styles.stream()
-          .map(p -> "<link href=\"" + cpath + p + "\" rel=\"stylesheet\">\n")
-          .collect(Collectors.joining()));
+      List<String> css = this.styles.apply(asset);
+      String styles = css.stream().reduce(new StringBuilder(),
+          (buff, it) -> buff.append("<link href=\"")
+              .append(cpath)
+              .append(it)
+              .append("\" rel=\"stylesheet\">\n"),
+          StringBuilder::append)
+          .toString();
+      req.set(asset + "_css", css);
+      req.set(asset + "_styles", styles);
 
       /** Scripts */
-      List<String> scripts = compiler.scripts(asset);
-      req.set(asset + "_js", scripts);
-      req.set(asset + "_scripts", scripts.stream()
-          .map(p -> "<script src=\"" + cpath + p + "\"></script>\n")
-          .collect(Collectors.joining()));
+      List<String> js = this.scripts.apply(asset);
+      String scripts = js.stream().reduce(new StringBuilder(),
+          (buff, it) -> buff.append("<script src=\"")
+              .append(cpath)
+              .append(it)
+              .append("\"></script>\n"),
+          StringBuilder::append)
+          .toString();
+      req.set(asset + "_js", js);
+      req.set(asset + "_scripts", scripts);
     });
   }