fixed lookup of HashMap key before method

README.md

@@ -216,19 +216,19 @@ repositories {
 
 ```
 dependencies {
-	runtime(group: 'synapticloop', name: 'templar', version: '1.4.2', ext: 'jar')
+	runtime(group: 'synapticloop', name: 'templar', version: '1.4.3', ext: 'jar')
 
-	compile(group: 'synapticloop', name: 'templar', version: '1.4.2', ext: 'jar')
+	compile(group: 'synapticloop', name: 'templar', version: '1.4.3', ext: 'jar')
 }
 ```
 
 or, more simply for versions of gradle greater than 2.1
 
 ```
 dependencies {
-	runtime 'synapticloop:templar:1.4.2'
+	runtime 'synapticloop:templar:1.4.3'
 
-	compile 'synapticloop:templar:1.4.2'
+	compile 'synapticloop:templar:1.4.3'
 }
 ```
 
@@ -238,7 +238,7 @@ dependencies {
 <dependency>
 	<groupId>synapticloop</groupId>
 	<artifactId>templar</artifactId>
-	<version>1.4.2</version>
+	<version>1.4.3</version>
 	<type>jar</type>
 </dependency>
 ```

build.gradle

@@ -20,11 +20,13 @@ plugins {
 group = 'synapticloop'
 archivesBaseName = 'templar'
 description = """Templar templating engine"""
-version = '1.4.2'
+version = '1.4.4'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
+// tasks.withType(Javadoc).all { enabled = false }
+
 cobertura {
 	coverageFormats = [ 'html', 'xml']
 }

src/main/java/synapticloop/templar/helper/ObjectHelper.java

@@ -87,7 +87,7 @@ public static Object evaluateObject(String commandLine, TemplarContext templarCo
 				Method invokeMethod = findMethod(object, nextToken);
 				if(null != invokeMethod) {
 					foundMethod = true;
-					int parameterCount = invokeMethod.getParameterCount();
+					int parameterCount = invokeMethod.getParameterTypes().length;
 					switch (parameterCount) {
 					case 0:
 						object = invokeObjectMethod(object, invokeMethod);
@@ -282,6 +282,14 @@ public static Object parseAndExecuteCommandLine(TemplarContext templarContext, S
 	private static Method findMethod(Object object, String reference) throws RenderException {
 		Method returnMethod = null;
 		if(object instanceof Map<?, ?>) {
+			if(((Map<?,?>)object).containsKey(reference)) {
+				try {
+					return(object.getClass().getMethod("get", Object.class));
+				} catch (NoSuchMethodException nsmex) {
+				} catch (SecurityException sex) {
+				}
+			}
+
 			try {
 				returnMethod = object.getClass().getMethod(reference);
 				if(null != returnMethod) {
@@ -293,6 +301,7 @@ private static Method findMethod(Object object, String reference) throws RenderE
 				// fall through
 			}
 
+
 			try {
 				// it could be that we are looking up a direct call on the object
 
@@ -339,7 +348,7 @@ private static Method getMethod(Object object, String methodReference) throws Re
 		} catch (NullPointerException npex) {
 			throw new RenderException("Got Null Pointer for method '" + methodReference + "' on object '" + object + "'.", npex);
 		}
-			
+
 
 		return(null);
 	}

src/main/java/synapticloop/templar/token/LoopToken.java

@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 import synapticloop.templar.exception.ParseException;
@@ -126,6 +127,21 @@ public String render(TemplarContext templarContext) throws RenderException {
 				first = false;
 				offset++;
 			}
+		} else if(object instanceof Map<?, ?>) {
+			Map<?, ?> map = (Map<?, ?>)object;
+			Iterator<?> iterator = map.keySet().iterator();
+			boolean first = true;
+			int offset = 0;
+			while (iterator.hasNext()) {
+				Object nextObject = (Object) iterator.next();
+				templarContext.add(contextAs, nextObject);
+				templarContext.add(contextAs + STATUS, new LoopStatusBean(first, !iterator.hasNext(), offset + 1, offset));
+				for (Token token : this.childTokens) {
+					stringBuilder.append(token.render(templarContext));
+				}
+				first = false;
+				offset++;
+			}
 		} else if (object instanceof Iterable<?>) {
 			Iterable<?> iterable = (Iterable<?>)object;
 			boolean first = true;