fix #998 add support for variables in

Author: Mpdreamz

src/Nest/Resolvers/PropertyNameResolver.cs

@@ -8,6 +8,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Collections.Concurrent;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 
 namespace Nest.Resolvers
 {
@@ -130,9 +132,12 @@ protected override Expression VisitMethodCall(MethodCallExpression m, Stack<stri
 		{
 			if (m.Method.Name == "Suffix" && m.Arguments.Any())
 			{
-				var constantExpression = m.Arguments.Last() as ConstantExpression;
-				if (constantExpression != null)
-					stack.Push(constantExpression.Value as string);
+				VisitConstantOrVariable(m, stack);
+				var callingMember = new ReadOnlyCollection<Expression>(
+					new List<Expression> {{m.Arguments.First()}}
+				);
+				base.VisitExpressionList(callingMember, stack, properties);
+				return m;
 			}
 			else if (m.Method.Name == "FullyQualified" && m.Arguments.Any())
 			{
@@ -152,16 +157,11 @@ protected override Expression VisitMethodCall(MethodCallExpression m, Stack<stri
 				{
 					return base.VisitMethodCall(m, stack, properties);
 				}
-				var lastArg = m.Arguments.Last();
-				var constantExpression = lastArg as ConstantExpression;
-				var value = constantExpression != null
-					? constantExpression.Value.ToString()
-					: Expression.Lambda(lastArg).Compile().DynamicInvoke().ToString();
-				stack.Push(value);
+				VisitConstantOrVariable(m, stack);
 				Visit(m.Object, stack, properties);
 				return m;
 			}
-			if (IsLinqOperator(m.Method))
+			else if (IsLinqOperator(m.Method))
 			{
 				for (int i = 1; i < m.Arguments.Count; i++)
 				{
@@ -172,6 +172,16 @@ protected override Expression VisitMethodCall(MethodCallExpression m, Stack<stri
 			}
 			return base.VisitMethodCall(m, stack, properties);
 		}
+
+		private static void VisitConstantOrVariable(MethodCallExpression m, Stack<string> stack)
+		{
+			var lastArg = m.Arguments.Last();
+			var constantExpression = lastArg as ConstantExpression;
+			var value = constantExpression != null
+				? constantExpression.Value.ToString()
+				: Expression.Lambda(lastArg).Compile().DynamicInvoke().ToString();
+			stack.Push(value);
+		}
 
 		private static bool IsLinqOperator(MethodInfo method)
 		{

src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyVisitorTests.cs

@@ -155,18 +155,26 @@ public void CollectionSuffix()
 			P(p => p.Collection.Suffix("suffix")).Should().Be("collection.suffix");
 		}
 
+		[Test]
+		public void PropertySuffixVariable()
+		{
+			P(p => p.Name.Suffix(_variable)).Should().Be("name.vari");
+		}
 
+		[Test]
+		public void PropertySuffixLocalVariable()
+		{
+			var prop = "propXY12";
+			P(p => p.Name.Suffix(prop)).Should().Be("name." + prop);
+		}
 
+		//Fully qualified tests
+		//TODO remove in 2.0 as type.properties are gonna be removed in elasticsearch 2.0
 
-
-
-
-
-
-
-
-
-
-
+		[Test]
+		public void PropertySuffixVariableFullyQualified()
+		{
+			P(p => p.FullyQualified().Name.Suffix(_variable)).Should().Be("domainobject.name.vari");
+		}
 	}
 }