implemented nested tags #207

Author: Igor Polevoy

activeweb-testing/src/main/java/app/controllers/SimpleController.java

@@ -23,5 +23,8 @@
  * @author Igor Polevoy
  */
 public class SimpleController extends AppController {
-    public void index(){}
+    public void index(){
+
+        redirect();
+    }
 }

javalite-templator/src/main/java/org/javalite/templator/AbstractTag.java

@@ -5,10 +5,14 @@
 import org.javalite.templator.tags.ListTag;
 
 import java.io.Writer;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
 
 import static org.javalite.common.Collections.list;
+import static org.javalite.common.Inflector.capitalize;
 
 /**
  * This class represents a custom tag written in Java and linked into template manager, such as:
@@ -38,10 +42,6 @@ public int getArgumentsEndIndex() {
         return argumentsEndIndex;
     }
 
-    public void setArgumentsEndIndex(int argumentsEndIndex) {
-        this.argumentsEndIndex = argumentsEndIndex;
-    }
-
     public int getTagStartIndex() {
         return tagStartIndex;
     }
@@ -54,10 +54,6 @@ public int getTagEndIndex() {
         return tagEndIndex;
     }
 
-    public void setTagEndIndex(int tagEndIndex) {
-        this.tagEndIndex = tagEndIndex;
-    }
-
     public String getBody() {
         return body;
     }
@@ -186,4 +182,53 @@ public boolean marchArgumentEnd(String template, int index){
         }
         return false;
     }
+
+    /**
+     * Tries to get a property value from object.
+     *
+     * @param obj object to get property value from
+     * @param propertyName name of property
+     * @return value of property, or null if not found
+     */
+    protected final Object getValue(Object obj, String propertyName) throws InvocationTargetException, IllegalAccessException {
+
+        Object val = null;
+
+        //try map
+        if (obj instanceof Map) {
+            Map objectMap = (Map) obj;
+            val = objectMap.get(propertyName);
+        }
+
+        //try generic get method
+        if (val == null) {
+            try {
+                Method m = obj.getClass().getMethod("get", String.class);
+                val = m.invoke(obj, propertyName);
+            } catch (NoSuchMethodException ignore) {
+            }
+        }
+
+        if (val == null) {
+            //try properties
+            try {
+                Method m = obj.getClass().getMethod("get" + capitalize(propertyName));
+                val = m.invoke(obj);
+            } catch (NoSuchMethodException ignore) {
+            }
+        }
+
+        if (val == null) {
+            // try public fields
+            try {
+                Field f = obj.getClass().getDeclaredField(propertyName);
+                val = f.get(obj);
+
+            } catch (NoSuchFieldException ignore) {
+            } catch (IllegalAccessException ignore) {
+            }
+        }
+
+        return val;
+    }
 }

javalite-templator/src/main/java/org/javalite/templator/MergeTag.java

@@ -30,24 +30,29 @@ class MergeTag extends AbstractTag {
     public void setArguments(String argumentLine) {
         super.setArguments(argumentLine);
         this.expression = argumentLine.contains(".");
-        boolean hasBuiltIn = argumentLine.contains(" ");
+        boolean hasBuiltIn = argumentLine.trim().contains(" ");
 
-        if (argumentLine.length() - argumentLine.replace(" ", "").length() > 1)
-            throw new ParseException("Merge token: " + argumentLine + " has more that one space");
+        //TODO: write tests for exceptional conditions:
+        if ((argumentLine.length() - argumentLine.replace(" ", "").length()) > 1)
+            throw new ParseException("Merge field: '" + argumentLine + "' has more than one space");
 
 
-        if (argumentLine.length() - argumentLine.replace(".", "").length() > 1)
-            throw new ParseException("Merge token: " + argumentLine + " has more that one dots");
+        if ((argumentLine.length() - argumentLine.replace(".", "").length()) > 1)
+            throw new ParseException("Merge field: '" + argumentLine + "' has more than one dots");
 
         if (hasBuiltIn) {
-            String[] parts = Util.split(argumentLine, ' ');
+            String[] parts = Util.split(argumentLine.trim(), ' ');
             String builtInName = parts[1];
             builtIn = TemplatorConfig.instance().getBuiltIn(builtInName);
 
             if (expression) {
-                parts = Util.split(parts[0], '.');
-                this.objectName = parts[0];
-                this.propertyName = parts[1];
+                String[] expr = Util.split(parts[0], '.');
+
+                if(expr.length != 2)
+                    throw new ParseException("Expression: '" + parts[0] +  "' must include object name and property name separated by a single dot. Nothing else.");
+
+                this.objectName = expr[0];
+                this.propertyName = expr[1];
             }
         } else if (expression) {
             String[] parts = Util.split(argumentLine, '.');
@@ -68,42 +73,7 @@ public void process(Map values, Writer writer) {
             if (expression) {
                 if (values.containsKey(objectName)) {
                     Object obj = values.get(objectName);
-                    Object val = null;
-
-                    //try map
-                    if (obj instanceof Map) {
-                        Map objectMap = (Map) obj;
-                        val = objectMap.get(propertyName);
-                    }
-
-                    //try generic get method
-                    if (val == null) {
-                        try {
-                            Method m = obj.getClass().getMethod("get", String.class);
-                            val = m.invoke(obj, propertyName);
-                        } catch (NoSuchMethodException ignore) {
-                        }
-                    }
-
-                    if (val == null) {
-                        //try properties
-                        try {
-                            Method m = obj.getClass().getMethod("get" + capitalize(propertyName));
-                            val = m.invoke(obj);
-                        } catch (NoSuchMethodException ignore) {
-                        }
-                    }
-
-                    if (val == null) {
-                        // try public fields
-                        try {
-                            Field f = obj.getClass().getDeclaredField(propertyName);
-                            val = f.get(obj);
-
-                        } catch (NoSuchFieldException ignore) {
-                        } catch (IllegalAccessException ignore) {
-                        }
-                    }
+                    Object val = getValue(obj, propertyName);
 
                     if (val != null) {
                         if (builtIn != null) {

javalite-templator/src/main/java/org/javalite/templator/Template.java

@@ -1,12 +1,10 @@
 package org.javalite.templator;
 
-import org.javalite.templator.tags.IfTag;
-import org.javalite.templator.tags.ListTag;
-
 import java.io.Writer;
-import java.util.*;
-
-import static org.javalite.common.Util.split;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
 
 /**
  * @author Igor Polevoy on 1/10/15.
@@ -16,11 +14,11 @@ public class Template {
     private final List<TemplateToken> templateTokens = new ArrayList<TemplateToken>();
 
     public Template(String template) {
-        try{
+        try {
             parse(template);
-        }catch(ParseException e){
+        } catch (ParseException e) {
             throw e;
-        }catch(Exception e){
+        } catch (Exception e) {
             throw new TemplateException(e);
         }
 
@@ -31,9 +29,11 @@ List<TemplateToken> templateTokens() {
         return templateTokens;
     }
 
+    Stack<AbstractTag> stack = new Stack<AbstractTag>();
+
     private void parse(String template) throws IllegalAccessException, InstantiationException {
         Map<String, Class> tags = TemplatorConfig.instance().getTags();
-        Stack<AbstractTag> stack = new Stack<AbstractTag>();
+
         List<AbstractTag> tagsList = new ArrayList<AbstractTag>();
 
         //TODO: separate iterations through all tags, and focus on stack
@@ -45,7 +45,7 @@ private void parse(String template) throws IllegalAccessException, Instantiation
                 tag = (AbstractTag) tagClass.newInstance();
 
                 //match tag start, such as "<#list"
-                if (stack.isEmpty() && tag.matchStartAtIndex(template, templateIndex)) {
+                if (tag.matchStartAtIndex(template, templateIndex)) {
                     tag.setTagStartIndex(templateIndex - tag.getTagStart().length());
                     stack.push(tag);
                     continue;
@@ -66,28 +66,33 @@ private void parse(String template) throws IllegalAccessException, Instantiation
 
                 //match tag end, such as:    <#list people as person > body </#list>
                 //                                                       ---^
-                if (!stack.isEmpty() && stack.peek().matchEndTag(template, templateIndex)) {
-                    AbstractTag currentTag = stack.pop();
-                    tagsList.add(currentTag);
+                if (!stack.isEmpty()
+                        && stack.peek().matchEndTag(template, templateIndex)) {
 
-                    String arguments;
-                    if (currentTag.getArgumentsEndIndex() != -1) { // we have body. case like this: <#list people as person > body </#list>
-                        arguments = template.substring(currentTag.getTagStartIndex() + currentTag.getTagStart().length(), currentTag.getArgumentsEndIndex());
-                        String body = template.substring(currentTag.getArgumentsEndIndex() + 1, currentTag.getTagEndIndex());
-                        currentTag.setBody(body);
+                    AbstractTag currentTag = stack.pop();
+                    if (stack.size() == 0) {
+                        tagsList.add(currentTag);
+                        String arguments;
+                        if (currentTag.getArgumentsEndIndex() != -1) { // we have body. case like this: <#list people as person > body </#list>
+                            arguments = template.substring(currentTag.getTagStartIndex() + currentTag.getTagStart().length(), currentTag.getArgumentsEndIndex());
+                            String body = template.substring(currentTag.getArgumentsEndIndex() + 1, currentTag.getTagEndIndex());
+                            currentTag.setBody(body);
+                        } else {
+                            // this is what is between the start and end tag in case there is no body:
+                            ///<@blah arguments for blah />
+                            arguments = template.substring(currentTag.getTagStartIndex() + currentTag.getTagStart().length(), currentTag.getTagEndIndex());
+                        }
+                        currentTag.setArguments(arguments);
                     } else {
-                        // this is what is between the start and end tag in case there is no body:
-                        ///<@blah arguments for blah />
-                        arguments = template.substring(currentTag.getTagStartIndex() + currentTag.getTagStart().length(), currentTag.getTagEndIndex());
+                        break;
                     }
-                    currentTag.setArguments(arguments);
                 }
             }
         }
 
-        if(tagsList.size() == 0){ // assuming that this is just text, no funny business
+        if (tagsList.size() == 0) { // assuming that this is just text, no funny business
             templateTokens.add(new StringToken(template));
-        }else{
+        } else {
             //now we need to collect string chunks in between
             for (int i = 0; i < tagsList.size(); i++) {
                 AbstractTag currentTag = tagsList.get(i);
@@ -98,17 +103,17 @@ private void parse(String template) throws IllegalAccessException, Instantiation
                 }
 
                 // if there is a gap between current and previous
-                if(tagsList.size() > 1 && i != 0){
-                    int startIndex = tagsList.get(i - 1).getTagEndIndex() + 1;
+                if (tagsList.size() > 1 && i != 0) {
+                    int startIndex = tagsList.get(i - 1).getTagEndIndex() + tagsList.get(i - 1).getMatchingEnd().length();
                     int endIndex = currentTag.getTagStartIndex();
-                    StringToken st = new StringToken(template.substring(startIndex, endIndex ));
+                    StringToken st = new StringToken(template.substring(startIndex, endIndex));
                     templateTokens.add(st);
                 }
 
                 templateTokens.add(currentTag);
 
                 // if this is the last tag and there is some text after
-                if(i == (tagsList.size() - 1) && template.length() > currentTag.getTagEndIndex()) {
+                if (i == (tagsList.size() - 1) && template.length() > currentTag.getTagEndIndex()) {
                     StringToken st = new StringToken(template.substring(currentTag.getTagEndIndex() + currentTag.getMatchingEnd().length()));
                     templateTokens.add(st);
                 }
@@ -120,23 +125,13 @@ private void parse(String template) throws IllegalAccessException, Instantiation
         }
     }
 
-    private static class Token {
-        int index;
-        String token;
-
-        private Token(int index, String token) {
-            this.index = index;
-            this.token = token;
-        }
-    }
-
-
     public void process(Map values, Writer writer) {
-
         try {
             for (TemplateToken token : templateTokens) {
                 token.process(values, writer);
             }
+        } catch (TemplateException e) {
+            throw e;
         } catch (Exception e) {
             throw new TemplateException(e);
         }

javalite-templator/src/main/java/org/javalite/templator/TemplatorConfig.java

@@ -80,7 +80,7 @@ public void registerBuiltIn(String name, BuiltIn builtIn) {
 
     public BuiltIn getBuiltIn(String name)  {
         if (!builtIns.containsKey(name))
-            throw new TemplateException("BuiltIn named '" + name + "' was not registered");
+            throw new TemplateException("Built-in named '" + name + "' was not registered");
 
         try{
             return builtIns.get(name);