add tests for mvc

gulpfile.js

@@ -5,7 +5,7 @@ var download = require("gulp-download");
 var del = require('del');
 var assemblyInfo = require('gulp-dotnet-assembly-info');
 var xunit = xunit = require('gulp-xunit-runner');
-var version = '1.5.0';
+var version = '1.4.0';
 
 gulp.task('clean', ()=>{
     return del(['src/**/obj/', 'src/**/bin/Release', 'nuget.exe', 'nupkgs'])

src/CompressR.MVC/CompressAttribute.cs

@@ -14,7 +14,12 @@ namespace CompressR.MVC
         {
         }
 
-        public override void OnResultExecuted(ResultExecutedContext filterContext)
+        /// <summary>
+        /// Override to compress the content that is generated by
+        /// an action method.
+        /// </summary>
+        /// <param name="filterContext"></param>
+        public override void OnActionExecuting(System.Web.Mvc.ActionExecutingContext filterContext)
         {
             CompressFactory.Compress(filterContext, RequireCompression, CompressionLevel);
         }

src/CompressR.MVC/CompressFactory.cs

@@ -9,12 +9,8 @@ namespace CompressR.MVC
 {
     public static class CompressFactory
     {
-        public static void Compress(System.Web.Mvc.ResultExecutedContext filterContext, bool requireCompression, string compression, CompressionLevel compressLevel = CompressionLevel.Optimal)
+        public static void Compress(System.Web.Mvc.ActionExecutingContext filterContext, bool requireCompression, string compression, CompressionLevel compressLevel = CompressionLevel.Optimal)
         {
-            if(filterContext.Exception != null && !filterContext.ExceptionHandled)
-            {
-                return;
-            }
             var context = filterContext.RequestContext.HttpContext;
             var compressionAccepted = context.Request.Headers.Get(Constants.AcceptEncoding)?.Split(',').Trim().Any(a => string.Equals(a, compression, StringComparison.OrdinalIgnoreCase)) ?? false;
             if(!compressionAccepted)
@@ -32,12 +28,8 @@ namespace CompressR.MVC
             HandleCompression(compression, filterContext, compressLevel);
         }
 
-        public static void Compress(System.Web.Mvc.ResultExecutedContext filterContext, bool requireCompression, CompressionLevel compressLevel = CompressionLevel.Optimal)
+        public static void Compress(System.Web.Mvc.ActionExecutingContext filterContext, bool requireCompression, CompressionLevel compressLevel = CompressionLevel.Optimal)
         {
-            if(filterContext.Exception != null && !filterContext.ExceptionHandled)
-            {
-                return;
-            }
             var context = filterContext.RequestContext.HttpContext;
             var compressionAlgorithm = context.Request.Headers.Get(Constants.AcceptEncoding)?.Split(',').Trim().Intersect(Constants.Compressors, StringComparer.OrdinalIgnoreCase)?.FirstOrDefault();
             if(!string.IsNullOrWhiteSpace(compressionAlgorithm))
@@ -50,14 +42,9 @@ namespace CompressR.MVC
             }
         }
 
-        private static void HandleCompression(string compression, System.Web.Mvc.ResultExecutedContext filterContext, CompressionLevel compressLevel = CompressionLevel.Optimal)
+        private static void HandleCompression(string compression, System.Web.Mvc.ActionExecutingContext filterContext, CompressionLevel compressLevel = CompressionLevel.Optimal)
         {
             var context = filterContext.RequestContext.HttpContext;
-            HandleCompression(compression, filterContext.RequestContext.HttpContext, compressLevel);
-        }
-
-        private static void HandleCompression(string compression, System.Web.HttpContextBase context, CompressionLevel compressLevel)
-        {
             switch(compression)
             {
                 case Constants.Gzip:

src/CompressR.MVC/Constants.cs

@@ -1,4 +1,8 @@
-namespace CompressR.MVC
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CompressR.MVC
 {
     public struct Constants
     {

src/CompressR.MVC/DeflateAttribute.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO.Compression;
 using System.Linq;
-using System.Web.Mvc;
 
 namespace CompressR.MVC
 {
@@ -18,10 +17,9 @@ namespace CompressR.MVC
         /// an action method.
         /// </summary>
         /// <param name="filterContext"></param>
-
-        public override void OnResultExecuted(ResultExecutedContext filterContext)
+        public override void OnActionExecuting(System.Web.Mvc.ActionExecutingContext filterContext)
         {
-            CompressFactory.Compress(filterContext, RequireCompression, CompressionLevel);
+            CompressFactory.Compress(filterContext, RequireCompression, Constants.Deflate, CompressionLevel);
         }
     }
 }

src/CompressR.MVC/Extensions.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace CompressR.MVC
 {
@@ -6,7 +8,7 @@ namespace CompressR.MVC
     {
         public static IEnumerable<string> Trim(this IEnumerable<string> arr)
         {
-            foreach(var item in arr)
+            foreach (var item in arr)
             {
                 yield return item.Trim();
             }

src/CompressR.MVC/GzipAttribute.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO.Compression;
 using System.Linq;
-using System.Web.Mvc;
 
 namespace CompressR.MVC
 {
@@ -12,9 +11,14 @@ namespace CompressR.MVC
         {
         }
 
-        public override void OnResultExecuted(ResultExecutedContext filterContext)
+        /// <summary>
+        /// Override to compress the content that is generated by
+        /// an action method.
+        /// </summary>
+        /// <param name="filterContext"></param>
+        public override void OnActionExecuting(System.Web.Mvc.ActionExecutingContext filterContext)
         {
-            CompressFactory.Compress(filterContext, RequireCompression, CompressionLevel);
+            CompressFactory.Compress(filterContext, RequireCompression, Constants.Gzip, CompressionLevel);
         }
     }
 }

src/CompressR.MVCUnitTests/CompressionFactoryTests.cs

@@ -22,15 +22,15 @@ namespace CompressR.MVCUnitTests
             request.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection() { });
             var httpContext = new Moq.Mock<HttpContextBase>();
             httpContext.Setup(a => a.Request).Returns(request.Object);
-            Assert.Throws(typeof(CompressR.Exceptions.CompressRException), () =>
-            {
-                CompressR.MVC.CompressFactory.Compress(new System.Web.Mvc.ResultExecutedContext()
+            Assert.Throws(typeof(CompressR.Exceptions.CompressRException), () => {
+
+                CompressR.MVC.CompressFactory.Compress(new System.Web.Mvc.ActionExecutingContext()
                 {
                     HttpContext = httpContext.Object
                 }, true);
             });
+            
         }
-
         [Fact]
         public void ShouldNotThrowButAlsoNotCompressIfFalse()
         {
@@ -41,16 +41,17 @@ namespace CompressR.MVCUnitTests
             var response = new Mock<HttpResponseBase>();
             httpContext.Setup(a => a.Response).Returns(response.Object);
             var contextObject = httpContext.Object;
-            CompressR.MVC.CompressFactory.Compress(new System.Web.Mvc.ResultExecutedContext()
+            CompressR.MVC.CompressFactory.Compress(new System.Web.Mvc.ActionExecutingContext()
             {
                 HttpContext = contextObject
             }, false);
             Assert.Null(contextObject.Response.Filter);
-        }
 
+        }
         [Fact]
         public void ShouldGzipWhenRequested()
         {
+
             var request = new Mock<HttpRequestBase>();
             request.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection() { ["Accept-Encoding"] = "gzip" });
             var requestContextBase = new Mock<HttpContextBase>();
@@ -68,7 +69,7 @@ namespace CompressR.MVCUnitTests
             responseContext.Setup(a => a.Response).Returns(response.Object);
 
             requestContextBase.Setup(a => a.Response).Returns(response.Object);
-            var httpContext = new ResultExecutedContext()
+            var httpContext = new ActionExecutingContext()
             {
                 RequestContext = new System.Web.Routing.RequestContext()
                 {
@@ -82,77 +83,12 @@ namespace CompressR.MVCUnitTests
             //var contextObject = httpContext;
             CompressR.MVC.CompressFactory.Compress(httpContext, false);
             Assert.IsType<GZipStream>(httpContext.RequestContext.HttpContext.Response.Filter);
+
         }
-
-        [Fact]
-        public void ShouldNotGzipWhenExceptionNotHandled()
-        {
-            var request = new Mock<HttpRequestBase>();
-            request.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection() { ["Accept-Encoding"] = "gzip" });
-            var requestContextBase = new Mock<HttpContextBase>();
-            requestContextBase.Setup(a => a.Request).Returns(request.Object);
-            var requestContext = new Mock<RequestContext>();
-            requestContext.Setup(a => a.HttpContext).Returns(requestContextBase.Object);
-            var cachePolicy = new Mock<HttpCachePolicyBase>();
-            cachePolicy.Setup(a => a.VaryByHeaders).Returns(new HttpCacheVaryByHeaders());
-            //var httpContext = new Moq.Mock<ActionExecutingContext>();
-            var response = new Mock<HttpResponseBase>();
-            response.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection());
-            response.SetupProperty(a => a.Filter, new MemoryStream(Encoding.UTF8.GetBytes("awesome")) { });
-            response.Setup(a => a.Cache).Returns(cachePolicy.Object);
-            var responseContext = new Mock<HttpContextBase>();
-            responseContext.Setup(a => a.Response).Returns(response.Object);
-
-            requestContextBase.Setup(a => a.Response).Returns(response.Object);
-            var httpContext = new ResultExecutedContext()
-            {
-                RequestContext = new System.Web.Routing.RequestContext()
-                {
-                    HttpContext = requestContextBase.Object
-                },
-                Exception = new Exception(),
-                ExceptionHandled = false
-            };
-            CompressR.MVC.CompressFactory.Compress(httpContext, false);
-            Assert.IsNotType<GZipStream>(httpContext.RequestContext.HttpContext.Response.Filter);
-        }
-
-        [Fact]
-        public void ShouldGzipWhenExceptionHandled()
-        {
-            var request = new Mock<HttpRequestBase>();
-            request.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection() { ["Accept-Encoding"] = "gzip" });
-            var requestContextBase = new Mock<HttpContextBase>();
-            requestContextBase.Setup(a => a.Request).Returns(request.Object);
-            var requestContext = new Mock<RequestContext>();
-            requestContext.Setup(a => a.HttpContext).Returns(requestContextBase.Object);
-            var cachePolicy = new Mock<HttpCachePolicyBase>();
-            cachePolicy.Setup(a => a.VaryByHeaders).Returns(new HttpCacheVaryByHeaders());
-            //var httpContext = new Moq.Mock<ActionExecutingContext>();
-            var response = new Mock<HttpResponseBase>();
-            response.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection());
-            response.SetupProperty(a => a.Filter, new MemoryStream(Encoding.UTF8.GetBytes("awesome")) { });
-            response.Setup(a => a.Cache).Returns(cachePolicy.Object);
-            var responseContext = new Mock<HttpContextBase>();
-            responseContext.Setup(a => a.Response).Returns(response.Object);
-
-            requestContextBase.Setup(a => a.Response).Returns(response.Object);
-            var httpContext = new ResultExecutedContext()
-            {
-                RequestContext = new System.Web.Routing.RequestContext()
-                {
-                    HttpContext = requestContextBase.Object
-                },
-                Exception = new Exception(),
-                ExceptionHandled = true
-            };
-            CompressR.MVC.CompressFactory.Compress(httpContext, false);
-            Assert.IsType<GZipStream>(httpContext.RequestContext.HttpContext.Response.Filter);
-        }
-
         [Fact]
         public void ShouldDeflateWhenRequested()
         {
+            
             var request = new Mock<HttpRequestBase>();
             request.Setup(a => a.Headers).Returns(new System.Collections.Specialized.NameValueCollection() { ["Accept-Encoding"] = "deflate" });
             var requestContextBase = new Mock<HttpContextBase>();
@@ -170,7 +106,7 @@ namespace CompressR.MVCUnitTests
             responseContext.Setup(a => a.Response).Returns(response.Object);
 
             requestContextBase.Setup(a => a.Response).Returns(response.Object);
-            var httpContext = new ResultExecutedContext()
+            var httpContext = new ActionExecutingContext()
             {
                 RequestContext = new System.Web.Routing.RequestContext()
                 {
@@ -184,6 +120,7 @@ namespace CompressR.MVCUnitTests
             //var contextObject = httpContext;
             CompressR.MVC.CompressFactory.Compress(httpContext, false);
             Assert.IsType<DeflateStream>(httpContext.RequestContext.HttpContext.Response.Filter);
+
         }
     }
-}
+}

src/CompressR.WebApi/BaseCompressAttribute.cs

@@ -23,11 +23,7 @@ namespace CompressR.WebApi
 
         protected async Task CompressAction(HttpActionExecutedContext actionExecutedContext, params string[] compressors)
         {
-            if(actionExecutedContext?.Exception != null)
-            {
-                return;
-            }
-            if(actionExecutedContext?.Response?.Content == null)
+            if(actionExecutedContext.Response.Content == null)
             {
                 return;
             }

src/CompressR.WebApi/CompressAttribute.cs

@@ -16,10 +16,6 @@ namespace CompressR.WebApi
 
         public override Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
         {
-            if(cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromResult(0);
-            }
             return base.CompressAction(actionExecutedContext, Constants.Compressors);
         }
     }

src/CompressR.WebApi/DeflateAttribute.cs

@@ -24,10 +24,6 @@ namespace CompressR.WebApi
 
         public override Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
         {
-            if(cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromResult(0);
-            }
             return base.CompressAction(actionExecutedContext, Constants.Deflate);
         }
     }

src/CompressR.WebApi/GzipAttribute.cs

@@ -23,10 +23,6 @@ namespace CompressR.WebApi
 
         public override Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
         {
-            if(cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromResult(0);
-            }
             return base.CompressAction(actionExecutedContext, Constants.Gzip);
         }
     }