Assets resolving in dev mode (1.4.0 release) fix jooby-project#1122

jknack · jknack · commit 95e4f4d98659 · 2018-06-11T21:09:31.000-03:00
diff --git a/modules/jooby-assets/src/main/java/org/jooby/assets/Assets.java b/modules/jooby-assets/src/main/java/org/jooby/assets/Assets.java
@@ -516,8 +516,9 @@ public void configure(final Env env, final Config config, final Binder binder) t
     // live compiler?
     AssetHandler handler;
     if (watch) {
+      Path publicDir = Paths.get(conf.getString("user.dir"), "public");
       Path workdir = Paths.get(conf.getString("assets.outputDir"));
-      handler = new FileSystemAssetHandler("/", workdir);
+      handler = new FileSystemAssetHandler("/", workdir, publicDir);
       LiveCompiler liveCompiler = new LiveCompiler(compiler, workdir);
 
       routes.use("*", "*", liveCompiler)
diff --git a/modules/jooby-assets/src/main/java/org/jooby/internal/assets/FileSystemAssetHandler.java b/modules/jooby-assets/src/main/java/org/jooby/internal/assets/FileSystemAssetHandler.java
@@ -203,23 +203,30 @@
  */
 package org.jooby.internal.assets;
 
+import static org.jooby.funzy.Throwing.throwingFunction;
 import org.jooby.handlers.AssetHandler;
 
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
 
 public class FileSystemAssetHandler extends AssetHandler {
 
-  private final Path workdir;
+  private final List<Path> sources;
 
-  public FileSystemAssetHandler(final String pattern, final Path workdir) {
+  public FileSystemAssetHandler(final String pattern, final Path... sources) {
     super(pattern);
-    this.workdir = workdir;
+    this.sources = Arrays.asList(sources);
   }
 
   @Override protected URL resolve(String path) throws Exception {
-    Path file = workdir.resolve(path);
-    return Files.exists(file) ? file.toUri().toURL() : null;
+    return sources.stream()
+        .map(source -> source.resolve(path))
+        .filter(Files::exists)
+        .findFirst()
+        .map(throwingFunction(it -> it.toUri().toURL()))
+        .orElse(null);
   }
 }
diff --git a/modules/jooby-assets/src/test/java/org/jooby/assets/AssetsTest.java b/modules/jooby-assets/src/test/java/org/jooby/assets/AssetsTest.java
@@ -97,6 +97,7 @@ public class AssetsTest {
   @Test
   public void configure() throws Exception {
     Config conf = ConfigFactory.empty()
+        .withValue("user.dir", ConfigValueFactory.fromAnyRef(System.getProperty("user.dir")))
         .withValue("application.path", ConfigValueFactory.fromAnyRef("/path"))
         .withValue("assets.etag", ConfigValueFactory.fromAnyRef(true))
         .withValue("assets.outputDir",
@@ -123,6 +124,7 @@ public void configure() throws Exception {
   @Test
   public void configureRestart() throws Exception {
     Config conf = ConfigFactory.empty()
+        .withValue("user.dir", ConfigValueFactory.fromAnyRef(System.getProperty("user.dir")))
         .withValue("application.path", ConfigValueFactory.fromAnyRef("/path"))
         .withValue("assets.etag", ConfigValueFactory.fromAnyRef(true))
         .withValue("assets.outputDir",
@@ -151,6 +153,7 @@ public void configureRestart() throws Exception {
   @Test
   public void configureProdDist() throws Exception {
     Config conf = ConfigFactory.empty()
+        .withValue("user.dir", ConfigValueFactory.fromAnyRef(System.getProperty("user.dir")))
         .withValue("application.env", ConfigValueFactory.fromAnyRef("prod"))
         .withValue("assets.etag", ConfigValueFactory.fromAnyRef(true))
         .withValue("application.path", ConfigValueFactory.fromAnyRef("/"))
