Merge remote-tracking branch 'upstream/master'

Author: Ilya Brin

README.md

@@ -1038,9 +1038,6 @@ Hello {{#child}}{{this.value}}{{/child}}
 ## Dependencies
 
 ```text
-+- org.apache.commons:commons-lang3:jar:3.1
-+- org.antlr:antlr4-runtime:jar:4.5.1-1
-+- org.mozilla:rhino:jar:1.7R4
 +- org.slf4j:slf4j-api:jar:1.6.4
 ```
 

handlebars-guava-cache/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

handlebars-guava-cache/src/test/java/com/github/jknack/handlebars/io/GuavaCachedTemplateLoaderTest.java

@@ -24,7 +24,7 @@ public void testCacheWithExpiration() throws Exception {
 
     final int TOTAL = 1000;
 
-    Stopwatch sw = new Stopwatch().start();
+    Stopwatch sw = Stopwatch.createStarted();
     for (int i = 0; i < TOTAL; i++) {
       loader.sourceAt("template");
     }

handlebars-helpers/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

handlebars-helpers/src/main/java/com/github/jknack/handlebars/helper/JodaHelper.java

@@ -29,7 +29,7 @@
 /**
  * Handlebars Helper for JodaTime ReadableInstance objects.
  *
- * @author @mrhanlon https://github.com/mrhanlon
+ * @author mrhanlon
  */
 public enum JodaHelper implements Helper<ReadableInstant> {
 

handlebars-helpers/src/main/java/com/github/jknack/handlebars/helper/NumberHelper.java

@@ -36,8 +36,9 @@ public enum NumberHelper implements Helper<Object> {
    * You can use the isEven helper to return a value only if the first argument
    * is even. Otherwise return null.
    *
+   * <pre>{@code
    * <li class="{{isEven value "leftBox"}}">
-   *
+   * }</pre>
    * If value is 2, the output will be "leftBox".
    *
    */
@@ -52,8 +53,9 @@ public CharSequence safeApply(final Number value, final Options options) {
    * You can use the isOdd helper to return a value only if the first argument
    * is odd. Otherwise return null.
    *
+   * <pre>{@code
    * <li class="{{isOdd value "rightBox"}}">
-   *
+   * }</pre>
    * If value is 3, the output will be "rightBox".
    *
    */
@@ -68,8 +70,9 @@ public CharSequence safeApply(final Number value, final Options options) {
    * You can use the stripes helper to return different value if the passed
    * argument is odd or even.
    *
+   * <pre>{@code
    * <tr class="{{stripes value "row-even" "row-odd"}}">
-   *
+   * }</pre>
    * If value is 2, the output will be "row-even".
    *
    */

handlebars-humanize/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

handlebars-humanize/src/main/java/com/github/jknack/handlebars/HumanizeHelper.java

@@ -24,6 +24,7 @@
 import java.util.Locale;
 
 import com.github.jknack.handlebars.internal.Locales;
+
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -235,7 +236,7 @@ public Object apply(final Object value, final Options options)
    * <p>
    * Constructs a message with pluralization logic from the given template.
    * </p>
-   * <h5>Examples:</h5>
+   * Examples:
    *
    * <pre>
    * MessageFormat msg =
@@ -274,7 +275,7 @@ public Object apply(final Object value, final Options options)
    * {{pluralize "pattern" arg0, arg1, ..., argn [locale="default"]}}
    * </pre>
    *
-   * @see Humanize#pluralize(String, Locale)
+   * @see Humanize#pluralizeFormat(String, Locale)
    */
   pluralize {
     @Override
@@ -289,6 +290,7 @@ public Object apply(final Object value, final Options options)
    * <p>
    * Transforms a text into a representation suitable to be used in an URL.
    * </p>
+   * <pre>{@code
    * <table border="0" cellspacing="0" cellpadding="3" width="100%">
    * <tr>
    * <th class="colFirst">Input</th>
@@ -303,6 +305,7 @@ public Object apply(final Object value, final Options options)
    * <td>"lo-siento-no-hablo-espanol"</td>
    * </tr>
    * </table>
+   * }</pre>
    *
    * <pre>
    * {{slugify string}}
@@ -378,25 +381,6 @@ public Object apply(final Object value, final Options options)
     }
   },
 
-  /**
-   * <p>
-   * Strips diacritic marks.
-   * </p>
-   *
-   * <pre>
-   * {{transliterate string}}
-   * </pre>
-   *
-   * @see Humanize#transliterate(String)
-   */
-  transliterate {
-    @Override
-    public Object apply(final Object value, final Options options)
-        throws IOException {
-      return Humanize.transliterate((String) value);
-    }
-  },
-
   /**
    * <p>
    * Makes a phrase underscored instead of spaced.

handlebars-humanize/src/test/java/com/github/jknack/handlebars/HumanizeHelperTest.java

@@ -20,7 +20,7 @@ public void binaryPrefix() throws IOException {
     assertEquals("2 bytes",
         handlebars.compileInline("{{binaryPrefix this}}").apply(2));
 
-    assertEquals("1.5 kB",
+    assertEquals("1.5 KB",
         handlebars.compileInline("{{binaryPrefix this}}").apply(1536));
 
     assertEquals("5 MB",
@@ -211,13 +211,6 @@ public void titleize() throws IOException {
             .apply("Handlebars.java rocks!"));
   }
 
-  @Test
-  public void transliterate() throws IOException {
-    assertEquals("Hablo espanol",
-        handlebars.compileInline("{{transliterate this}}")
-            .apply("Hablo español"));
-  }
-
   @Test
   public void underscore() throws IOException {
     assertEquals("Handlebars_Java_rock",

handlebars-jackson2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.jknack</groupId>
     <artifactId>handlebars.java</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>