Issue 113: &attributes on Mixin not working

neuland · Nov 10, 2015 · 5740075 · 5740075
1 parent e6044c9
commit 5740075
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 15 deletions.
diff --git a/src/main/java/de/neuland/jade4j/parser/node/AttrsNode.java b/src/main/java/de/neuland/jade4j/parser/node/AttrsNode.java
@@ -113,13 +113,13 @@ public boolean hasCodeNode() {
     }
 
 	protected String visitAttributes(JadeModel model, JadeTemplate template) {
-
+        LinkedList<Attr> newAttributes = new LinkedList<Attr>(attributes);
         if(attributeBlocks.size()>0){
             //Todo: AttributesBlock needs to be evaluated
             for (String attributeBlock : attributeBlocks) {
                 HashMap<String,String> o = null;
                 try {
-                    o = (HashMap<String,String>)template.getExpressionHandler().evaluateExpression(attributeBlock, model);
+                    o = (HashMap<String,String>) template.getExpressionHandler().evaluateExpression(attributeBlock, model);
                 } catch (ExpressionException e) {
                     e.printStackTrace();
                 }
@@ -128,14 +128,14 @@ protected String visitAttributes(JadeModel model, JadeTemplate template) {
                         Attr attr = new Attr();
                         attr.setName(entry.getKey());
                         attr.setValue(entry.getValue());
-                        attributes.add(attr);
+                        newAttributes.add(attr);
                     }
                 }
             }
-            LinkedHashMap<String,String> attrs = attrs(model, template);
+            LinkedHashMap<String,String> attrs = attrs(model, template,newAttributes);
             return attrsToString(attrs, template);
         }else{
-            LinkedHashMap<String,String> attrs = attrs(model, template);
+            LinkedHashMap<String,String> attrs = attrs(model, template, newAttributes);
             return attrsToString(attrs, template);
         }
 
@@ -160,10 +160,10 @@ private String attrsToString(LinkedHashMap<String, String> attrs, JadeTemplate t
         return sb.toString();
     }
 
-    protected LinkedHashMap<String,String> attrs(JadeModel model, JadeTemplate template) {
+    protected LinkedHashMap<String,String> attrs(JadeModel model, JadeTemplate template, LinkedList<Attr> attrs) {
         ArrayList<String> classes = new ArrayList<String>();
         LinkedHashMap<String,String> newAttributes = new LinkedHashMap<String,String>();
-        for (Attr attribute : attributes) {
+        for (Attr attribute : attrs) {
             try {
                 addAttributesToMap(newAttributes,classes, attribute, model, template);
             } catch (ExpressionException e) {

diff --git a/src/main/java/de/neuland/jade4j/parser/node/CallNode.java b/src/main/java/de/neuland/jade4j/parser/node/CallNode.java
@@ -1,8 +1,6 @@
 package de.neuland.jade4j.parser.node;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
 
 import de.neuland.jade4j.compiler.IndentWriter;
 import de.neuland.jade4j.exceptions.ExpressionException;
@@ -121,13 +119,37 @@ private void writeVariables(JadeModel model, MixinNode mixin, JadeTemplate templ
 	private void writeAttributes(JadeModel model, MixinNode mixin, JadeTemplate template) {
 //		model.put("attributes", mergeInheritedAttributes(model));
 //		model.put("attributes", getArguments());
+		LinkedList<Attr> newAttributes = new LinkedList<Attr>(attributes);
 		if (attributeBlocks.size()>0) {
-    		if (attributes.size()>0) {
-				LinkedHashMap<String,String> attrs = attrs(model, template);
+			//Todo: AttributesBlock needs to be evaluated
+
+			for (String attributeBlock : attributeBlocks) {
+			   Object o = null;
+			   try {
+				   o = template.getExpressionHandler().evaluateExpression(attributeBlock, model);
+			   } catch (ExpressionException e) {
+				   e.printStackTrace();
+			   }
+			   if(o!=null) {
+				   if(o instanceof HashMap) {
+					   for (Map.Entry<String, String> entry : ((HashMap<String,String>) o).entrySet()) {
+						   Attr attr = new Attr();
+						   attr.setName(entry.getKey());
+						   attr.setValue(entry.getValue());
+						   newAttributes.add(attr);
+					   }
+				   }else if(o instanceof String){
+					   System.out.print(o);
+				   }
+
+			   }
+		   }
+    		if (newAttributes.size()>0) {
+				LinkedHashMap<String,String> attrs = attrs(model, template, newAttributes);
+				model.put("attributes", attrs);
     		}
-			model.put("attributes", StringUtils.join(attributeBlocks, ","));
-  		} else if (attributes.size()>0) {
-			LinkedHashMap<String,String> attrs = attrs(model, template);
+  		} else if (newAttributes.size()>0) {
+			LinkedHashMap<String,String> attrs = attrs(model, template, newAttributes);
 			model.put("attributes", attrs);
   		}
 

diff --git a/src/test/resources/issues/113.html b/src/test/resources/issues/113.html
@@ -0,0 +1,4 @@
+
+<div>
+  <p data-bla="foo"></p>
+</div>
diff --git a/src/test/resources/issues/113.jade b/src/test/resources/issues/113.jade
@@ -0,0 +1,9 @@
+-var bla = "foo"
+mixin test()
+    div
+        +test2()&attributes(attributes)
+
+mixin test2()
+    p&attributes(attributes)
+
++test()(data-bla=bla)