Merge branch 'master' of github.com:gmarz/NEST

Conflicts:
	src/Nest/Nest.csproj

Author: Mpdreamz

src/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -219,6 +219,7 @@
     <Compile Include="Search\SearchType\ScriptFieldTests.cs" />
     <Compile Include="Internals\Serialize\SerializeTests.cs" />
     <Compile Include="Search\Sort\SortTests.cs" />
+    <Compile Include="Search\Suggest\CompletionSuggestTests.cs" />
     <Compile Include="Search\Suggest\PhraseSuggestTests.cs" />
     <Compile Include="Search\Suggest\TermSuggestTests.cs" />
     <Compile Include="Settings\UsePrettyResponseTests.cs" />

src/Nest.Tests.Unit/Search/suggest/CompletionSuggestTests.cs

@@ -0,0 +1,77 @@
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest.Tests.Unit.Search.Suggest
+{
+    [TestFixture]
+    public class CompletionSuggestTests : BaseJsonTests
+    {
+        [Test]
+        public void CompletionSuggestDescriptorTest()
+        {
+            var completionSuggestDescriptor = new CompletionSuggestDescriptor<ElasticSearchProject>()
+                .OnField("suggest")
+                .Text("n");
+
+            var json = TestElasticClient.Serialize(completionSuggestDescriptor);
+
+            var expected = @"{ ""field"": ""suggest"" }";
+
+            Assert.IsTrue(json.JsonEquals(expected), json);
+        }
+
+        [Test]
+        public void CompletionSuggestDescriptorDefaultFuzzyTest()
+        {
+            var completionSuggestDescriptor = new CompletionSuggestDescriptor<ElasticSearchProject>()
+                .OnField("suggest")
+                .Text("n")
+                .Fuzzy();
+
+            var json = TestElasticClient.Serialize(completionSuggestDescriptor);
+
+            var expected = @"{
+                              ""fuzzy"": {
+                                ""edit_distance"": 1,
+                                ""transpositions"": true,
+                                ""min_length"": 3,
+                                ""prefix_length"": 1
+                              },
+                              ""field"": ""suggest""
+                            }";
+
+            Assert.IsTrue(json.JsonEquals(expected), json);
+        }
+
+        [Test]
+        public void CompletionSuggestDescriptorFuzzyTest()
+        {
+            var completionSuggestDescriptor = new CompletionSuggestDescriptor<ElasticSearchProject>()
+                .OnField("suggest")
+                .Text("n")
+                .Fuzzy(f => f
+                    .EditDistance(2)
+                    .Transpositions(false)
+                    .MinLength(5)
+                    .PrefixLength(4));
+
+            var json = TestElasticClient.Serialize(completionSuggestDescriptor);
+
+            var expected = @"{
+                              ""fuzzy"": {
+                                ""edit_distance"": 2,
+                                ""transpositions"": false,
+                                ""min_length"": 5,
+                                ""prefix_length"": 4
+                              },
+                              ""field"": ""suggest""
+                            }";
+
+            Assert.IsTrue(json.JsonEquals(expected), json);
+        }
+    }
+}

src/Nest/DSL/Suggest/CompletionSuggestDescriptor.cs

@@ -11,6 +11,9 @@ namespace Nest
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
     public class CompletionSuggestDescriptor<T> : BaseSuggestDescriptor<T> where T : class
     {
+        [JsonProperty(PropertyName="fuzzy")]
+        internal FuzzySuggestDescriptor<T> _Fuzzy { get; set; }
+
         public CompletionSuggestDescriptor<T> Text(string text)
         {
             this._Text = text;
@@ -28,5 +31,17 @@ public CompletionSuggestDescriptor<T> OnField(Expression<Func<T, object>> object
             var fieldName = new PropertyNameResolver().Resolve(objectPath);
             return this.OnField(fieldName);
         }
+
+        public CompletionSuggestDescriptor<T> Fuzzy(Func<FuzzySuggestDescriptor<T>, FuzzySuggestDescriptor<T>> fuzzyDescriptor)
+        {
+            this._Fuzzy = fuzzyDescriptor(new FuzzySuggestDescriptor<T>());
+            return this;
+        }
+
+        public CompletionSuggestDescriptor<T> Fuzzy()
+        {
+            this._Fuzzy = new FuzzySuggestDescriptor<T>();
+            return this;
+        }
     }
 }

src/Nest/DSL/Suggest/FuzzySuggestDescriptor.cs

@@ -0,0 +1,57 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    public class FuzzySuggestDescriptor<T> where T : class
+    {
+        [JsonProperty(PropertyName="edit_distance")]
+        internal int _EditDistance { get; set; }
+
+        [JsonProperty(PropertyName = "transpositions")]
+        internal bool _Transpositions { get; set; }
+
+        [JsonProperty(PropertyName = "min_length")]
+        internal int _MinLength { get; set; }
+
+        [JsonProperty(PropertyName = "prefix_length")]
+        internal int _PrefixLength { get; set; }
+
+        public FuzzySuggestDescriptor()
+        {
+            // Default values
+            this._EditDistance = 1;
+            this._Transpositions = true;
+            this._MinLength = 3;
+            this._PrefixLength = 1;
+        }
+
+        public FuzzySuggestDescriptor<T> EditDistance(int distance)
+        {
+            this._EditDistance = distance;
+            return this;
+        }
+
+        public FuzzySuggestDescriptor<T> Transpositions(bool transpositions)
+        {
+            this._Transpositions = transpositions;
+            return this;
+        }
+
+        public FuzzySuggestDescriptor<T> MinLength(int length)
+        {
+            this._MinLength = length;
+            return this;
+        }
+
+        public FuzzySuggestDescriptor<T> PrefixLength(int length)
+        {
+            this._PrefixLength = length;
+            return this;
+        }
+    }
+}

src/Nest/Nest.csproj

@@ -73,6 +73,7 @@
     <Compile Include="Domain\Mapping\Descriptors\CompletionMappingDescriptor.cs" />
     <Compile Include="Domain\Mapping\Types\CompletionMapping.cs" />
     <Compile Include="Domain\Responses\RootVersionInfoResponse.cs" />
+    <Compile Include="DSL\Suggest\FuzzySuggestDescriptor.cs" />
     <Compile Include="DSL\Filter\RegexpFilterDescriptor.cs" />
     <Compile Include="DSL\Query\RegexpQueryDescriptor.cs" />
     <Compile Include="Enums\DynamicMappingOption.cs" />