danielwertheim · iojancode · Dec 20, 2019 · Dec 20, 2019 · Aug 8, 2020 · Aug 8, 2020
diff --git a/azure-pipelines-cd.yml b/azure-pipelines-cd.yml
@@ -16,7 +16,7 @@ pr: none
 resources:
   containers:
   - container: couchdb
-    image: couchdb:2.3.1
+    image: ibmcom/couchdb3:3.1.0
     ports:
     - 5984:5984
     env:

diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -20,7 +20,7 @@ pr:
 resources:
   containers:
   - container: couchdb
-    image: couchdb:2.3.1
+    image: ibmcom/couchdb3:3.1.0
     ports:
     - 5984:5984
     env:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   couchdb:
-    image: "couchdb:2.3.1"
+    image: "ibmcom/couchdb3:3.1.0"
     environment:
       COUCHDB_USER: ${MyCouch_User}
       COUCHDB_PASSWORD: ${MyCouch_Pass}

diff --git a/source/projects/MyCouch/Contexts/Searches.cs b/source/projects/MyCouch/Contexts/Searches.cs
@@ -1,51 +1,51 @@
-//using System.Threading.Tasks;
-//using EnsureThat;
-//using MyCouch.Extensions;
-//using MyCouch.HttpRequestFactories;
-//using MyCouch.Requests;
-//using MyCouch.Responses;
-//using MyCouch.Responses.Factories;
-//using MyCouch.Serialization;
-
-//namespace MyCouch.Contexts
-//{
-//    public class Searches : ApiContextBase<IDbConnection>, ISearches
-//    {
-//        protected SearchIndexHttpRequestFactory SearchIndexHttpRequestFactory { get; set; }
-//        protected SearchIndexResponseFactory SearchIndexResponseFactory { get; set; }
-
-//        public Searches(IDbConnection connection, ISerializer documentSerializer, ISerializer serializer)
-//            : base(connection)
-//        {
-//            Ensure.That(documentSerializer, "documentSerializer").IsNotNull();
-//            Ensure.Any.IsNotNull(serializer, nameof(serializer));
-
-//            SearchIndexHttpRequestFactory = new SearchIndexHttpRequestFactory(serializer);
-//            SearchIndexResponseFactory = new SearchIndexResponseFactory(documentSerializer);
-//        }
-
-//        public virtual async Task<SearchIndexResponse> SearchAsync(SearchIndexRequest request)
-//        {
-//            Ensure.Any.IsNotNull(request, nameof(request));
-
-//            var httpRequest = SearchIndexHttpRequestFactory.Create(request);
-
-//            using (var res = await SendAsync(httpRequest).ForAwait())
-//            {
-//                return await SearchIndexResponseFactory.CreateAsync(res).ForAwait();
-//            }
-//        }
-
-//        public virtual async Task<SearchIndexResponse<TIncludedDoc>> SearchAsync<TIncludedDoc>(SearchIndexRequest request)
-//        {
-//            Ensure.Any.IsNotNull(request, nameof(request));
-
-//            var httpRequest = SearchIndexHttpRequestFactory.Create(request);
-
-//            using (var res = await SendAsync(httpRequest).ForAwait())
-//            {
-//                return await SearchIndexResponseFactory.CreateAsync<TIncludedDoc>(res).ForAwait();
-//            }
-//        }
-//    }
-//}
+using System.Threading.Tasks;
+using EnsureThat;
+using MyCouch.Extensions;
+using MyCouch.HttpRequestFactories;
+using MyCouch.Requests;
+using MyCouch.Responses;
+using MyCouch.Responses.Factories;
+using MyCouch.Serialization;
+
+namespace MyCouch.Contexts
+{
+   public class Searches : ApiContextBase<IDbConnection>, ISearches
+   {
+       protected SearchIndexHttpRequestFactory SearchIndexHttpRequestFactory { get; set; }
+       protected SearchIndexResponseFactory SearchIndexResponseFactory { get; set; }
+
+       public Searches(IDbConnection connection, ISerializer documentSerializer, ISerializer serializer)
+           : base(connection)
+       {
+           Ensure.That(documentSerializer, "documentSerializer").IsNotNull();
+           Ensure.Any.IsNotNull(serializer, nameof(serializer));
+
+           SearchIndexHttpRequestFactory = new SearchIndexHttpRequestFactory(serializer);
+           SearchIndexResponseFactory = new SearchIndexResponseFactory(documentSerializer);
+       }
+
+       public virtual async Task<SearchIndexResponse> SearchAsync(SearchIndexRequest request)
+       {
+           Ensure.Any.IsNotNull(request, nameof(request));
+
+           var httpRequest = SearchIndexHttpRequestFactory.Create(request);
+
+           using (var res = await SendAsync(httpRequest).ForAwait())
+           {
+               return await SearchIndexResponseFactory.CreateAsync(res).ForAwait();
+           }
+       }
+
+       public virtual async Task<SearchIndexResponse<TIncludedDoc>> SearchAsync<TIncludedDoc>(SearchIndexRequest request)
+       {
+           Ensure.Any.IsNotNull(request, nameof(request));
+
+           var httpRequest = SearchIndexHttpRequestFactory.Create(request);
+
+           using (var res = await SendAsync(httpRequest).ForAwait())
+           {
+               return await SearchIndexResponseFactory.CreateAsync<TIncludedDoc>(res).ForAwait();
+           }
+       }
+   }
+}
diff --git a/source/projects/MyCouch/HttpRequestFactories/SearchIndexHttpRequestFactory.cs b/source/projects/MyCouch/HttpRequestFactories/SearchIndexHttpRequestFactory.cs
@@ -1,110 +1,110 @@
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Net.Http;
-//using EnsureThat;
-//using MyCouch.Net;
-//using MyCouch.Requests;
-//using MyCouch.Serialization;
-
-//namespace MyCouch.HttpRequestFactories
-//{
-//    public class SearchIndexHttpRequestFactory
-//    {
-//        protected ISerializer Serializer { get; private set; }
-
-//        public SearchIndexHttpRequestFactory(ISerializer serializer)
-//        {
-//            Ensure.Any.IsNotNull(serializer, nameof(serializer));
-
-//            Serializer = serializer;
-//        }
-
-//        public virtual HttpRequest Create(SearchIndexRequest request)
-//        {
-//            Ensure.Any.IsNotNull(request, nameof(request));
-
-//            return new HttpRequest(HttpMethod.Get, GenerateRelativeUrl(request))
-//                .SetRequestTypeHeader(request.GetType());
-//        }
-
-//        protected virtual string GenerateRelativeUrl(SearchIndexRequest request)
-//        {
-//            return string.Format("/_design/{0}/_search/{1}{2}",
-//                new UrlSegment(request.IndexIdentity.DesignDocument),
-//                new UrlSegment(request.IndexIdentity.Name),
-//                GenerateRequestUrlQueryString(request));
-//        }
-
-//        protected virtual string GenerateRequestUrlQueryString(SearchIndexRequest request)
-//        {
-//            var p = GenerateQueryStringParams(request);
-
-//            return string.IsNullOrEmpty(p) ? string.Empty : string.Concat("?", p);
-//        }
-
-//        protected virtual string GenerateQueryStringParams(SearchIndexRequest request)
-//        {
-//            return string.Join("&", GenerateJsonCompatibleKeyValues(request)
-//                .Select(kv => string.Format("{0}={1}", kv.Key, UrlParam.Encode(kv.Value))));
-//        }
-
-//        protected virtual IDictionary<string, string> GenerateJsonCompatibleKeyValues(SearchIndexRequest request)
-//        {
-//            var kvs = new Dictionary<string, string>();
-
-//            if (!string.IsNullOrWhiteSpace(request.Expression))
-//                kvs.Add(KeyNames.Expression, request.Expression);
-
-//            if (request.HasSortings())
-//                kvs.Add(KeyNames.Sort, Serializer.ToJsonArray(request.Sort.ToArray()));
-
-//            if (!string.IsNullOrWhiteSpace(request.Bookmark))
-//                kvs.Add(KeyNames.Bookmark, request.Bookmark);
-
-//            if (request.Stale.HasValue)
-//                kvs.Add(KeyNames.Stale, request.Stale.Value.AsString());
-
-//            if (request.Limit.HasValue)
-//                kvs.Add(KeyNames.Limit, Serializer.ToJson(request.Limit.Value));
-
-//            if (request.IncludeDocs.HasValue)
-//                kvs.Add(KeyNames.IncludeDocs, Serializer.ToJson(request.IncludeDocs.Value));
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using EnsureThat;
+using MyCouch.Net;
+using MyCouch.Requests;
+using MyCouch.Serialization;
+
+namespace MyCouch.HttpRequestFactories
+{
+   public class SearchIndexHttpRequestFactory
+   {
+       protected ISerializer Serializer { get; private set; }
+
+       public SearchIndexHttpRequestFactory(ISerializer serializer)
+       {
+           Ensure.Any.IsNotNull(serializer, nameof(serializer));
+
+           Serializer = serializer;
+       }
+
+       public virtual HttpRequest Create(SearchIndexRequest request)
+       {
+           Ensure.Any.IsNotNull(request, nameof(request));
+
+           return new HttpRequest(HttpMethod.Get, GenerateRelativeUrl(request))
+               .SetRequestTypeHeader(request.GetType());
+       }
+
+       protected virtual string GenerateRelativeUrl(SearchIndexRequest request)
+       {
+           return string.Format("/_design/{0}/_search/{1}{2}",
+               new UrlSegment(request.IndexIdentity.DesignDocument),
+               new UrlSegment(request.IndexIdentity.Name),
+               GenerateRequestUrlQueryString(request));
+       }
+
+       protected virtual string GenerateRequestUrlQueryString(SearchIndexRequest request)
+       {
+           var p = GenerateQueryStringParams(request);
+
+           return string.IsNullOrEmpty(p) ? string.Empty : string.Concat("?", p);
+       }
+
+       protected virtual string GenerateQueryStringParams(SearchIndexRequest request)
+       {
+           return string.Join("&", GenerateJsonCompatibleKeyValues(request)
+               .Select(kv => string.Format("{0}={1}", kv.Key, UrlParam.Encode(kv.Value))));
+       }
+
+       protected virtual IDictionary<string, string> GenerateJsonCompatibleKeyValues(SearchIndexRequest request)
+       {
+           var kvs = new Dictionary<string, string>();
+
+           if (!string.IsNullOrWhiteSpace(request.Expression))
+               kvs.Add(KeyNames.Expression, request.Expression);
+
+           if (request.HasSortings())
+               kvs.Add(KeyNames.Sort, Serializer.ToJsonArray(request.Sort.ToArray()));
+
+           if (!string.IsNullOrWhiteSpace(request.Bookmark))
+               kvs.Add(KeyNames.Bookmark, request.Bookmark);
+
+           if (request.Stale.HasValue)
+               kvs.Add(KeyNames.Stale, request.Stale.Value.AsString());
+
+           if (request.Limit.HasValue)
+               kvs.Add(KeyNames.Limit, Serializer.ToJson(request.Limit.Value));
+
+           if (request.IncludeDocs.HasValue)
+               kvs.Add(KeyNames.IncludeDocs, Serializer.ToJson(request.IncludeDocs.Value));
 
-//            if (request.Ranges != null)
-//                kvs.Add(KeyNames.Ranges, Serializer.Serialize(request.Ranges));
-
-//            if (request.HasCounts())
-//                kvs.Add(KeyNames.Counts, Serializer.ToJsonArray(request.Counts.ToArray()));
-
-//            if (!string.IsNullOrWhiteSpace(request.GroupField))
-//                kvs.Add(KeyNames.GroupField, request.GroupField);
-
-//            if (request.GroupLimit.HasValue)
-//                kvs.Add(KeyNames.GroupLimit, Serializer.ToJson(request.GroupLimit.Value));
-
-//            if (request.HasGroupSortings())
-//                kvs.Add(KeyNames.GroupSort, Serializer.ToJsonArray(request.GroupSort.ToArray()));
-
-//            if (request.DrillDown.HasValue)
-//                kvs.Add(KeyNames.DrillDown, Serializer.ToJsonArray(new[] { request.DrillDown.Value.Key, request.DrillDown.Value.Value }));
-
-//            return kvs;
-//        }
-
-//        protected static class KeyNames
-//        {
-//            public const string Expression = "q";
-//            public const string Sort = "sort";
-//            public const string Bookmark = "bookmark";
-//            public const string Stale = "stale";
-//            public const string Limit = "limit";
-//            public const string IncludeDocs = "include_docs";
-//            public const string Ranges = "ranges";
-//            public const string Counts = "counts";
-//            public const string GroupField = "group_field";
-//            public const string GroupLimit = "group_limit";
-//            public const string GroupSort = "group_sort";
-//            public const string DrillDown = "drilldown";
-//        }
-//    }
-//}
+           if (request.Ranges != null)
+               kvs.Add(KeyNames.Ranges, Serializer.Serialize(request.Ranges));
+
+           if (request.HasCounts())
+               kvs.Add(KeyNames.Counts, Serializer.ToJsonArray(request.Counts.ToArray()));
+
+           if (!string.IsNullOrWhiteSpace(request.GroupField))
+               kvs.Add(KeyNames.GroupField, request.GroupField);
+
+           if (request.GroupLimit.HasValue)
+               kvs.Add(KeyNames.GroupLimit, Serializer.ToJson(request.GroupLimit.Value));
+
+           if (request.HasGroupSortings())
+               kvs.Add(KeyNames.GroupSort, Serializer.ToJsonArray(request.GroupSort.ToArray()));
+
+           if (request.DrillDown.HasValue)
+               kvs.Add(KeyNames.DrillDown, Serializer.ToJsonArray(new[] { request.DrillDown.Value.Key, request.DrillDown.Value.Value }));
+
+           return kvs;
+       }
+
+       protected static class KeyNames
+       {
+           public const string Expression = "q";
+           public const string Sort = "sort";
+           public const string Bookmark = "bookmark";
+           public const string Stale = "stale";
+           public const string Limit = "limit";
+           public const string IncludeDocs = "include_docs";
+           public const string Ranges = "ranges";
+           public const string Counts = "counts";
+           public const string GroupField = "group_field";
+           public const string GroupLimit = "group_limit";
+           public const string GroupSort = "group_sort";
+           public const string DrillDown = "drilldown";
+       }
+   }
+}
diff --git a/source/projects/MyCouch/IMyCouchClient.cs b/source/projects/MyCouch/IMyCouchClient.cs
@@ -65,7 +65,7 @@ public interface IMyCouchClient : IDisposable
         ///// <summary>
         ///// Used to access Search Indexes.
         ///// </summary>
-        //ISearches Searches { get; }
+        ISearches Searches { get; }
 
         /// <summary>
         /// View oriented API operations, for accessing and managing views.