Finish SSI handler

Author: jknack

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

@@ -0,0 +1,36 @@
+package org.jooby.issues;
+
+import org.jooby.handlers.SSIHandler;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue644 extends ServerFeature {
+
+  {
+    get("/i644/*", new SSIHandler());
+
+    get("/644/index.html",
+        new SSIHandler("/i644/ssi-jooby-include.html")
+            .delimiters("<!-- JOOBY-INCLUDE", "-->"));
+  }
+
+  @Test
+  public void ssi() throws Exception {
+    request()
+        .get("/i644/ssi.html")
+        .expect("<!-- The template for the note object -->\n" +
+            "<script type=\"text/x-template\" id=\"custom-note-template\">\n" +
+            "  <ul><li>Item</li></ul>\n" +
+            "</script>")
+        .header("Content-Type", "text/html;charset=utf-8");
+
+    request()
+        .get("/644/index.html")
+        .expect("<!-- The template for the note object -->\n" +
+            "<script type=\"text/x-template\" id=\"custom-note-template\">\n" +
+            "  <ul><li>Item</li></ul>\n" +
+            "</script>")
+        .header("Content-Type", "text/html;charset=utf-8");
+  }
+
+}

coverage-report/src/test/resources/i644/chunk.html

@@ -0,0 +1 @@
+<ul><li>Item</li></ul>

coverage-report/src/test/resources/i644/ssi-jooby-include.html

@@ -0,0 +1,4 @@
+<!-- The template for the note object -->
+<script type="text/x-template" id="custom-note-template">
+  <!-- JOOBY-INCLUDE /i644/chunk.html -->
+</script>

coverage-report/src/test/resources/i644/ssi.html

@@ -0,0 +1,4 @@
+<!-- The template for the note object -->
+<script type="text/x-template" id="custom-note-template">
+  <!-- /i644/chunk.html -->
+</script>

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

@@ -51,18 +51,18 @@ public void missingProp() throws Exception {
       new Props().process("/j.s", "$.ajax(${cpath}/service);", ConfigFactory.empty());
       fail();
     } catch (AssetException ex) {
-      assertEquals("\t/j.s:1:8: No configuration setting found for key 'cpath' at 1:8",
+      assertEquals("\t/j.s:1:8: Missing ${cpath} at 1:8",
           ex.getMessage());
-      assertEquals("No configuration setting found for key 'cpath' at 1:8", ex.get());
+      assertEquals("Missing ${cpath} at 1:8", ex.get());
     }
 
     try {
       new Props().process("/j.s", "$.ajax(\n\n   ${cpath}/service);", ConfigFactory.empty());
       fail();
     } catch (AssetException ex) {
-      assertEquals("\t/j.s:3:4: No configuration setting found for key 'cpath' at 3:4",
+      assertEquals("\t/j.s:3:4: Missing ${cpath} at 3:4",
           ex.getMessage());
-      assertEquals("No configuration setting found for key 'cpath' at 3:4", ex.get());
+      assertEquals("Missing ${cpath} at 3:4", ex.get());
     }
   }
 

jooby-run/TODO

@@ -1,4 +1,5 @@
 how do I detect a hotswap? and only then bounce the app?
+-- JavaHotCodeReplaceManager at eclipse.jdt.debug
 
 ideal implementation?
 + bounce when hotswap fail

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

@@ -41,7 +41,6 @@
 import com.google.inject.Key;
 import com.google.inject.name.Names;
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import javaslang.API;
 import javaslang.control.Option;
@@ -69,6 +68,73 @@
  */
 public interface Env extends LifeCycle {
 
+  /**
+   * Property source for {@link Resolver}
+   *
+   * @author edgar
+   * @since 1.1.0
+   */
+  interface PropertySource {
+
+    /**
+     * Get a property value or throw {@link NoSuchElementException}.
+     *
+     * @param key Property key/name.
+     * @return Value or throw {@link NoSuchElementException}.
+     * @throws NoSuchElementException If property is missing.
+     */
+    String get(String key) throws NoSuchElementException;
+  }
+
+  /**
+   * {@link PropertySource} for {@link Config}.
+   *
+   * @author edgar
+   * @since 1.1.0
+   */
+  class ConfigSource implements PropertySource {
+
+    private Config source;
+
+    public ConfigSource(final Config source) {
+      this.source = source;
+    }
+
+    @Override
+    public String get(final String key) throws NoSuchElementException {
+      if (source.hasPath(key)) {
+        return source.getString(key);
+      }
+      throw new NoSuchElementException(key);
+    }
+
+  }
+
+  /**
+   * {@link PropertySource} for {@link Map}.
+   *
+   * @author edgar
+   * @since 1.1.0
+   */
+  class MapSource implements PropertySource {
+
+    private Map<String, Object> source;
+
+    public MapSource(final Map<String, Object> source) {
+      this.source = source;
+    }
+
+    @Override
+    public String get(final String key) throws NoSuchElementException {
+      Object value = source.get(key);
+      if (value != null) {
+        return value.toString();
+      }
+      throw new NoSuchElementException(key);
+    }
+
+  }
+
   /**
    * Template literal implementation, replaces <code>${expression}</code> from a String using a
    * {@link Config} object.
@@ -80,7 +146,7 @@ class Resolver {
 
     private String endDelim = "}";
 
-    private Config source;
+    private PropertySource source;
 
     private boolean ignoreMissing;
 
@@ -91,8 +157,7 @@ class Resolver {
      * @return This resolver.
      */
     public Resolver source(final Map<String, Object> source) {
-      this.source = ConfigFactory.parseMap(source);
-      return this;
+      return source(new MapSource(source));
     }
 
     /**
@@ -101,11 +166,21 @@ public Resolver source(final Map<String, Object> source) {
      * @param source Source.
      * @return This resolver.
      */
-    public Resolver source(final Config source) {
+    public Resolver source(final PropertySource source) {
       this.source = source;
       return this;
     }
 
+    /**
+     * Set property source.
+     *
+     * @param source Source.
+     * @return This resolver.
+     */
+    public Resolver source(final Config source) {
+      return source(new ConfigSource(source));
+    }
+
     /**
      * Set start and end delimiters.
      *
@@ -166,14 +241,14 @@ public String resolve(final String text) {
         buffer.append(text.substring(offset, start));
         String key = text.substring(start + startDelim.length(), end);
         Object value;
-        if (source.hasPath(key)) {
-          value = source.getAnyRef(key);
-        } else {
+        try {
+          value = source.get(key);
+        } catch (NoSuchElementException x) {
           if (ignoreMissing) {
             value = text.substring(start, end + endDelim.length());
           } else {
             throw err.apply(start, (line, column) -> new NoSuchElementException(
-                "No configuration setting found for key '" + key + "' at " + line + ":" + column));
+                "Missing " + startDelim + key + endDelim + " at " + line + ":" + column));
           }
         }
         buffer.append(value);