Merge pull request #1 from neekgreen/updates

updates

src/PaginableCollections.AspNetCore/CondensedActionFilter.cs → src/PaginableCollections.AspNetCore/CondensedHeadersActionFilter.cs

@@ -1,19 +1,18 @@
 namespace PaginableCollections.AspNetCore
 {
-    using System;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Filters;
     using Microsoft.Extensions.Options;
     using Newtonsoft.Json;
 
-    public class CondensedActionFilter : IAsyncActionFilter
+    public class CondensedHeadersActionFilter : IAsyncActionFilter
     {
         private const string HeaderPrefix = "X-Paginable";
 
         private readonly IOptions<MvcJsonOptions> options;
 
-        public CondensedActionFilter(IOptions<MvcJsonOptions> options)
+        public CondensedHeadersActionFilter(IOptions<MvcJsonOptions> options)
         {
             this.options = options;
         }
@@ -22,9 +21,7 @@ async Task IAsyncActionFilter.OnActionExecutionAsync(ActionExecutingContext cont
         {
             await next();
 
-            var paginable = (context.Result as ObjectResult)?.Value as IPaginable;
-
-            if (paginable != null)
+            if ((context.Result as ObjectResult)?.Value is IPaginable paginable)
             {
                 context.HttpContext.Response.Headers.Add(
                     HeaderPrefix,

src/PaginableCollections.AspNetCore/ExpandedActionFilter.cs → src/PaginableCollections.AspNetCore/ExpandedHeadersActionFilter.cs

@@ -1,21 +1,18 @@
 namespace PaginableCollections.AspNetCore
 {
-    using System;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Filters;
 
-    public class ExpandedActionFilter : IAsyncActionFilter
+    public class ExpandedHeadersActionFilter : IAsyncActionFilter
     {
         private const string HeaderPrefix = "X-Paginable";
 
         async Task IAsyncActionFilter.OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
             await next();
 
-            var paginable = (context.Result as ObjectResult)?.Value as IPaginable;
-
-            if (paginable != null)
+            if ((context.Result as ObjectResult)?.Value is IPaginable paginable)
             {
                 context.HttpContext.Response.Headers.Add($"{HeaderPrefix}-PageNumber", paginable.PageNumber.ToString());
                 context.HttpContext.Response.Headers.Add($"{HeaderPrefix}-ItemCountPerPage", paginable.ItemCountPerPage.ToString());

src/PaginableCollections.AspNetCore/HeaderFormat.cs

@@ -0,0 +1,8 @@
+namespace PaginableCollections.AspNetCore
+{
+    public enum HeaderFormat
+    {
+        Condensed = 0,
+        Expanded = 1
+    }
+}

src/PaginableCollections.AspNetCore/HeaderFormatOptions.cs

@@ -0,0 +1,23 @@
+namespace PaginableCollections.AspNetCore
+{
+    public class HeaderFormatOptions
+    {
+        public HeaderFormatOptions() { }
+
+
+        public HeaderFormat HeaderFormat { get; set; } = HeaderFormat.Condensed;
+
+
+        public HeaderFormatOptions UseCondensed()
+        {
+            HeaderFormat = HeaderFormat.Condensed;
+            return this;
+        }
+
+        public HeaderFormatOptions UseExpanded()
+        {
+            HeaderFormat = HeaderFormat.Expanded;
+            return this;
+        }
+    }
+}

src/PaginableCollections.AspNetCore/MvcBuilderExtensions.cs

@@ -5,15 +5,23 @@
 
     public static class MvcBuilderExtensions
     {
-        public static IMvcBuilder UsePaginableHeaders(this IMvcBuilder builder, Action<HeaderOptions> options)
+        public static IMvcBuilder UsePaginableHeaders(this IMvcBuilder builder)
         {
-            var o = new HeaderOptions();
+            return builder.UsePaginableHeaders(t => t.UseExpanded());
+        }
+
+        public static IMvcBuilder UsePaginableHeaders(this IMvcBuilder builder, Action<HeaderFormatOptions> options)
+        {
+            var o = new HeaderFormatOptions();
             options(o);
 
-            if (o.IsCondensed)
-                return builder.AddMvcOptions(t => t.Filters.Add(typeof(CondensedActionFilter)));
-            else
-                return builder.AddMvcOptions(t => t.Filters.Add(typeof(ExpandedActionFilter)));
+            switch (o.HeaderFormat)
+            {
+                case HeaderFormat.Expanded:
+                    return builder.AddMvcOptions(t => t.Filters.Add(typeof(ExpandedHeadersActionFilter)));
+                default:
+                    return builder.AddMvcOptions(t => t.Filters.Add(typeof(CondensedHeadersActionFilter)));
+            } 
         }
     }
 }

src/PaginableCollections.AspNetCore/PaginableCollections.AspNetCore.csproj

@@ -13,7 +13,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/neekgreen/paginablecollections.aspnetcore</RepositoryUrl>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
-    <Version>0.2.0</Version>
+    <Version>0.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/PaginableCollections.AspNetCore/PaginableHeader.cs

@@ -4,10 +4,10 @@ public class PaginationHeader
     {
         public PaginationHeader(IPaginable paginable)
         {
-            this.PageNumber = paginable.PageNumber;
-            this.ItemCountPerPage = paginable.ItemCountPerPage;
-            this.TotalItemCount = paginable.TotalItemCount;
-            this.TotalPageCount = paginable.TotalPageCount;
+            PageNumber = paginable.PageNumber;
+            ItemCountPerPage = paginable.ItemCountPerPage;
+            TotalItemCount = paginable.TotalItemCount;
+            TotalPageCount = paginable.TotalPageCount;
         }
 
         public int ItemCountPerPage { get; set; }