wrong doc for asset props processor fix #403

Author: jknack

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

@@ -20,6 +20,8 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.jooby.Env;
 import org.jooby.MediaType;
@@ -71,6 +73,8 @@
  */
 public class Props extends AssetProcessor {
 
+  private static Pattern POS = Pattern.compile("at\\s(\\d+):(\\d+)");
+
   {
     set("delims", Arrays.asList("${", "}"));
   }
@@ -83,9 +87,20 @@ public boolean matches(final MediaType type) {
   @Override
   public String process(final String filename, final String source, final Config conf)
       throws Exception {
+    try {
     Env env = Env.DEFAULT.build(conf);
     List<String> delims = get("delims");
     return env.resolve(source, delims.get(0), delims.get(1));
+    } catch (Exception cause) {
+      int line = -1;
+      int column = -1;
+      Matcher matcher = POS.matcher(cause.getMessage());
+      if (matcher.find()) {
+        line = Integer.parseInt(matcher.group(1));
+        column = Integer.parseInt(matcher.group(2));
+      }
+      throw new AssetException(name(), new AssetProblem(filename, line, column, cause.getMessage(), null));
+    }
   }
 
 }

jooby-assets/src/test/java/org/jooby/assets/PropsTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 
@@ -36,4 +37,21 @@ public void shouldSupportCustomDelimiters() throws Exception {
                 .empty().withValue("app.url", ConfigValueFactory.fromAnyRef("http://foo.com"))));
   }
 
+  @Test
+  public void missingProp() throws Exception {
+    try {
+      new Props().process("/j.s", "$.ajax(${cpath}/service);", ConfigFactory.empty());
+      fail();
+    } catch (AssetException ex) {
+      assertEquals("[/j.s:1:8: No configuration setting found for key 'cpath' at 1:8]", ex.getMessage());
+    }
+
+    try {
+      new Props().process("/j.s", "$.ajax(\n\n   ${cpath}/service);", ConfigFactory.empty());
+      fail();
+    } catch (AssetException ex) {
+      assertEquals("[/j.s:3:4: No configuration setting found for key 'cpath' at 3:4]", ex.getMessage());
+    }
+  }
+
 }

jooby/src/main/java/org/jooby/Env.java

@@ -23,11 +23,12 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
@@ -242,24 +243,37 @@ default String resolve(final String text, final Config source) {
   default String resolve(final String text, final Config source,
       final String startDelimiter, final String endDelimiter) {
     requireNonNull(text, "Text is required.");
-    requireNonNull(source, "A config source is required.");
+    requireNonNull(source, "Config source is required.");
     checkArgument(!Strings.isNullOrEmpty(startDelimiter), "Start delimiter is required.");
     checkArgument(!Strings.isNullOrEmpty(endDelimiter), "End delimiter is required.");
     if (text.length() == 0) {
       return "";
     }
+
+    BiFunction<Integer, BiFunction<Integer, Integer, RuntimeException>, RuntimeException> err = (
+        start, ex) -> {
+      String snapshot = text.substring(0, start);
+      int line = Splitter.on('\n').splitToList(snapshot).size();
+      int column = start - snapshot.lastIndexOf('\n');
+      return ex.apply(line, column);
+    };
+
     StringBuilder buffer = new StringBuilder();
     int offset = 0;
     int start = text.indexOf(startDelimiter);
     while (start >= 0) {
       int end = text.indexOf(endDelimiter, start + startDelimiter.length());
       if (end == -1) {
-        throw new IllegalArgumentException("Unclosed placeholder: "
-            + Splitter.on(CharMatcher.WHITESPACE)
-                .split(text.subSequence(start, text.length())).iterator().next());
+        throw err.apply(start, (line, column) -> new IllegalArgumentException(
+            "found '" + startDelimiter + "' expecting '" + endDelimiter + "' at " + line + ":"
+                + column));
       }
       buffer.append(text.substring(offset, start));
       String key = text.substring(start + startDelimiter.length(), end);
+      if (!source.hasPath(key)) {
+        throw err.apply(start, (line, column) -> new NoSuchElementException(
+            "No configuration setting found for key '" + key + "' at " + line + ":" + column));
+      }
       buffer.append(source.getAnyRef(key));
       offset = end + endDelimiter.length();
       start = text.indexOf(startDelimiter, offset);

jooby/src/main/resources/org/jooby/jooby.conf

@@ -206,3 +206,9 @@ cors {
 err.java.lang.IllegalArgumentException = 400
 err.java.util.NoSuchElementException = 400
 err.java.io.FileNotFoundException = 404
+
+###################################################################################################
+#! alias
+###################################################################################################
+
+contextPath = ${application.path}

jooby/src/test/java/org/jooby/EnvTest.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import java.util.NoSuchElementException;
 import java.util.Optional;
 
 import org.junit.Test;
@@ -105,7 +106,7 @@ public void unclosedDelimiterWithSpace() {
       env.resolve(env.resolve("function ($) {$.ajax(\"${contextPath /api\")"));
       fail();
     } catch (IllegalArgumentException ex) {
-      assertEquals("Unclosed placeholder: ${contextPath", ex.getMessage());
+      assertEquals("found '${' expecting '}' at 1:23", ex.getMessage());
     }
   }
 
@@ -116,7 +117,46 @@ public void unclosedDelimiter() {
       env.resolve(env.resolve("function ($) {$.ajax(\"${contextPath/api\")"));
       fail();
     } catch (IllegalArgumentException ex) {
-      assertEquals("Unclosed placeholder: ${contextPath/api\")", ex.getMessage());
+      assertEquals("found '${' expecting '}' at 1:23", ex.getMessage());
+    }
+  }
+
+  @Test
+  public void noSuchKey() {
+    Env env = Env.DEFAULT.build(ConfigFactory.empty());
+    try {
+      env.resolve(env.resolve("${key}"));
+      fail();
+    } catch (NoSuchElementException ex) {
+      assertEquals("No configuration setting found for key 'key' at 1:1", ex.getMessage());
+    }
+
+    try {
+      env.resolve(env.resolve("    ${key}"));
+      fail();
+    } catch (NoSuchElementException ex) {
+      assertEquals("No configuration setting found for key 'key' at 1:5", ex.getMessage());
+    }
+
+    try {
+      env.resolve(env.resolve("  \n  ${key}"));
+      fail();
+    } catch (NoSuchElementException ex) {
+      assertEquals("No configuration setting found for key 'key' at 2:3", ex.getMessage());
+    }
+
+    try {
+      env.resolve(env.resolve("  \n  ${key}"));
+      fail();
+    } catch (NoSuchElementException ex) {
+      assertEquals("No configuration setting found for key 'key' at 2:3", ex.getMessage());
+    }
+
+    try {
+      env.resolve(env.resolve("  \n \n ${key}"));
+      fail();
+    } catch (NoSuchElementException ex) {
+      assertEquals("No configuration setting found for key 'key' at 3:2", ex.getMessage());
     }
   }
 

md/doc/assets-props/assets-props.md

@@ -4,17 +4,6 @@ Replace ```${expressions}``` with a value from ```application.conf```.
 
 {{assets-require.md}}
 
-## dependency
-
-```xml
-<dependency>
-  <groupId>org.jooby</groupId>
-  <artifactId>jooby-assets-props</artifactId>
-  <version>{{version}}</version>
-  <scope>provided</scope>
-</dependency>
-```
-
 ## usage
 
 ```