Partials with parameters fix #350

support passing hash to partials fix #357

handlebars/src/main/antlr4/com/github/jknack/handlebars/internal/HbsParser.g4

@@ -116,7 +116,7 @@ delimiters
 
 partial
   :
-    START_PARTIAL PATH QID? END
+    START_PARTIAL PATH QID? hash* END
   ;
 
 param

handlebars/src/main/java/com/github/jknack/handlebars/internal/Partial.java

@@ -17,6 +17,7 @@
  */
 package com.github.jknack.handlebars.internal;
 
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.join;
 import static org.apache.commons.lang3.Validate.notEmpty;
 
@@ -25,6 +26,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import com.github.jknack.handlebars.Context;
 import com.github.jknack.handlebars.Handlebars;
@@ -43,7 +45,7 @@
  * @author edgar.espina
  * @since 0.1.0
  */
-class Partial extends BaseTemplate {
+class Partial extends HelperResolver {
 
   /**
    * The partial path.
@@ -76,11 +78,14 @@ class Partial extends BaseTemplate {
    * @param handlebars The Handlebars object. Required.
    * @param path The template path.
    * @param context The template context.
+   * @param hash Template params
    */
-  public Partial(final Handlebars handlebars, final String path, final String context) {
+  public Partial(final Handlebars handlebars, final String path, final String context,
+      final Map<String, Object> hash) {
     super(handlebars);
     this.path = notEmpty(path, "The path is required.");
     this.context = context;
+    this.hash(hash);
   }
 
   @Override
@@ -120,11 +125,8 @@ public void merge(final Context context, final Writer writer)
       }
 
       Template template = handlebars.compile(source);
-      if (this.context == null || this.context.equals("this")) {
-        template.apply(context, writer);
-      } else {
-        template.apply(Context.newContext(context, context.get(this.context)), writer);
-      }
+      String key = isEmpty(this.context) ? "this" : this.context;
+      template.apply(Context.newContext(context, context.get(key)).data(hash(context)), writer);
     } catch (IOException ex) {
       String reason = String.format("The partial '%s' could not be found",
           loader.resolve(path));
@@ -219,8 +221,8 @@ private String partialInput(final String input, final String indent) {
   @Override
   public String text() {
     StringBuilder buffer = new StringBuilder(startDelimiter)
-      .append('>')
-      .append(path);
+        .append('>')
+        .append(path);
 
     if (context != null) {
       buffer.append(' ').append(context);

handlebars/src/main/java/com/github/jknack/handlebars/internal/TemplateBuilder.java

@@ -407,7 +407,7 @@ public Template visitPartial(final PartialContext ctx) {
     TerminalNode partialContext = ctx.QID();
     String startDelim = ctx.start.getText();
     Template partial = new Partial(handlebars, uri,
-        partialContext != null ? partialContext.getText() : null)
+        partialContext != null ? partialContext.getText() : null, hash(ctx.hash()))
         .startDelimiter(startDelim.substring(0, startDelim.length() - 1))
         .endDelimiter(ctx.stop.getText())
         .indent(indent)

handlebars/src/test/java/com/github/jknack/handlebars/i350/Issue350.java

@@ -0,0 +1,42 @@
+package com.github.jknack.handlebars.i350;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.github.jknack.handlebars.AbstractTest;
+import com.github.jknack.handlebars.Handlebars;
+
+public class Issue350 extends AbstractTest {
+
+  @Override
+  protected void configure(final Handlebars handlebars) {
+    handlebars.prettyPrint(true);
+  }
+
+  @Test
+  public void partialWithParameters() throws IOException {
+    shouldCompileToWithPartials(
+        "<ul>\n" +
+            "{{#each dudes}}\n" +
+            "  {{> dude title=../title class=\"list-item\"}}\n" +
+            "{{/each}}\n" +
+            "</ul>",
+        $("title",
+            "profile",
+            "dudes",
+            new Object[]{$("name", "Yehuda", "url", "http://yehuda"),
+                $("name", "Alan", "url", "http://alan") }),
+        $("dude", "<li class=\"{{class}}\">\n" +
+            "  {{title}}: <a href=\"{{url}}\">{{name}}</a>\n" +
+            "</li>\n"),
+        "<ul>\n" +
+            "  <li class=\"list-item\">\n" +
+            "    profile: <a href=\"http://yehuda\">Yehuda</a>\n" +
+            "  </li>\n" +
+            "  <li class=\"list-item\">\n" +
+            "    profile: <a href=\"http://alan\">Alan</a>\n" +
+            "  </li>\n" +
+            "</ul>");
+  }
+}