Rhino 1.7.10 + favor int over decimal in handlebars.js

Author: jknack

handlebars/src/main/java/com/github/jknack/handlebars/internal/js/RhinoHandlebars.java

@@ -24,6 +24,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import static org.mozilla.javascript.Context.FEATURE_INTEGER_WITHOUT_DECIMAL_PLACE;
+import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.NativeArray;
 import org.mozilla.javascript.NativeObject;
 import org.mozilla.javascript.Scriptable;
@@ -323,13 +325,27 @@ public void registerHelpers(final String filename, final String source) throws E
    * @return A Rhino Context.
    */
   private org.mozilla.javascript.Context newContext() {
-    org.mozilla.javascript.Context ctx = org.mozilla.javascript.Context.enter();
+    final ContextFactory factory = newFactory();
+    org.mozilla.javascript.Context ctx = factory.enterContext();
     ctx.setOptimizationLevel(optimizationLevel);
     ctx.setErrorReporter(new ToolErrorReporter(false));
-    ctx.setLanguageVersion(org.mozilla.javascript.Context.VERSION_1_8);
+    ctx.setLanguageVersion(org.mozilla.javascript.Context.VERSION_ES6);
     return ctx;
   }
 
+  private static ContextFactory newFactory() {
+    return new ContextFactory() {
+      @Override
+      protected boolean hasFeature(final org.mozilla.javascript.Context cx,
+          final int featureIndex) {
+        if (featureIndex == FEATURE_INTEGER_WITHOUT_DECIMAL_PLACE) {
+          return true;
+        }
+        return super.hasFeature(cx, featureIndex);
+      }
+    };
+  }
+
   /**
    * Creates a initialize the helpers.rhino.js scope.
    *

handlebars/src/test/java/com/github/jknack/handlebars/i243/Issue243.java

@@ -28,7 +28,7 @@ protected Handlebars newHandlebars() {
   @Test
   public void zeroValueForJavaScriptHelper() throws IOException {
     shouldCompileTo("{{#each item}}{{getIndex @index}} {{/each}}",
-        $("item", new Object[]{10, 20, 30 }), "0.0 1.0 2.0 ");
+        $("item", new Object[]{10, 20, 30 }), "0 1 2 ");
   }
 
   @Test

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue614.java

@@ -0,0 +1,38 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.v4Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+public class Issue614 extends v4Test {
+
+  @Override protected void configure(Handlebars handlebars) {
+    try {
+      handlebars.registerHelpers("helpers.js",
+          "Handlebars.registerHelper('number', function(value) {\n"
+              + "   return value;\n"
+              + "});\n"
+              + "\n"
+              + "Handlebars.registerHelper('len', function(array) {\n"
+              + "   return array.length;\n"
+              + "});");
+    } catch (Exception x) {
+      throw new IllegalStateException(x);
+    }
+  }
+
+  @Test
+  public void shouldFavorIntOverDouble() throws Exception {
+    shouldCompileTo("{{number this}}", $("hash", 3), "3");
+    shouldCompileTo("{{number this}}", $("hash", 3.1), "3.1");
+
+    shouldCompileTo("{{len this}}", $("hash", new Object[]{1, 2, 3, 4}), "4");
+    shouldCompileTo("{{len this}}", $("hash", Arrays.asList(1, 2, 3, 4)), "4");
+  }
+}

pom.xml

@@ -93,7 +93,7 @@
       <dependency>
         <groupId>org.mozilla</groupId>
         <artifactId>rhino</artifactId>
-        <version>1.7R4</version>
+        <version>1.7.10</version>
       </dependency>
 
       <!-- Logging System -->