Switched to flag like options.

Author: moonpyk

DevTrends.MvcDonutCaching/CacheSettings.cs

@@ -10,8 +10,7 @@ public class CacheSettings
         public string VaryByCustom { get; set; }
         public OutputCacheLocation Location { get; set; }
         public bool NoStore { get; set; }
-        public bool IgnorePostData { get; set; }
-        public bool IgnoreQueryStringData { get; set; }
+        public OutputCacheOptions Options { get; set; }
 
         public bool IsServerCachingEnabled
         {
@@ -22,5 +21,6 @@ public bool IsServerCachingEnabled
                                                             Location == OutputCacheLocation.ServerAndClient);                
             }
         }
+
     }
 }

DevTrends.MvcDonutCaching/DonutOutputCacheAttribute.cs

@@ -16,17 +16,16 @@ public class DonutOutputCacheAttribute : ActionFilterAttribute, IExceptionFilter
         private readonly IKeyGenerator _keyGenerator;
         private readonly IExtendedOutputCacheManager _outputCacheManager;
         private CacheSettings _cacheSettings;
-        private bool? _ignorePostData;
-        private bool? _ignoreQueryStringData;
         private bool? _noStore;
+        private OutputCacheOptions? _options;
 
         public DonutOutputCacheAttribute()
         {
             var keyBuilder = new KeyBuilder();
 
             _keyGenerator         = new KeyGenerator(keyBuilder);
-            _donutHoleFiller      = new DonutHoleFiller(new EncryptingActionSettingsSerialiser(new ActionSettingsSerialiser(), new Encryptor()));
             _outputCacheManager   = new OutputCacheManager(OutputCache.Instance, keyBuilder);
+            _donutHoleFiller      = new DonutHoleFiller(new EncryptingActionSettingsSerialiser(new ActionSettingsSerialiser(), new Encryptor()));
             _cacheSettingsManager = new CacheSettingsManager();
             _cacheHeadersHelper   = new CacheHeadersHelper();
 
@@ -94,27 +93,15 @@ public bool NoStore
             }
         }
 
-        public bool IgnoreQueryStringData
-        {
-            get
-            {
-                return _ignoreQueryStringData ?? false;
-            }
-            set
-            {
-                _ignoreQueryStringData = value;
-            }
-        }
-
-        public bool IgnorePostData
+        public OutputCacheOptions Options
         {
             get
             {
-                return _ignorePostData ?? false;
+                return _options ?? OutputCacheOptions.None;
             }
             set
             {
-                _ignorePostData = value;
+                _options = value;
             }
         }
 
@@ -228,14 +215,13 @@ protected CacheSettings BuildCacheSettings()
             {
                 cacheSettings = new CacheSettings
                 {
-                    IsCachingEnabled      = _cacheSettingsManager.IsCachingEnabledGlobally,
-                    Duration              = Duration,
-                    VaryByCustom          = VaryByCustom,
-                    VaryByParam           = VaryByParam,
-                    Location              = (int)Location == -1 ? OutputCacheLocation.Server : Location,
-                    NoStore               = NoStore,
-                    IgnorePostData        = IgnorePostData,
-                    IgnoreQueryStringData = IgnoreQueryStringData,
+                    IsCachingEnabled = _cacheSettingsManager.IsCachingEnabledGlobally,
+                    Duration         = Duration,
+                    VaryByCustom     = VaryByCustom,
+                    VaryByParam      = VaryByParam,
+                    Location         = (int)Location == -1 ? OutputCacheLocation.Server : Location,
+                    NoStore          = NoStore,
+                    Options          = Options,
                 };
             }
             else
@@ -244,14 +230,13 @@ protected CacheSettings BuildCacheSettings()
 
                 cacheSettings = new CacheSettings
                 {
-                    IsCachingEnabled      = _cacheSettingsManager.IsCachingEnabledGlobally && cacheProfile.Enabled,
-                    Duration              = Duration == -1 ? cacheProfile.Duration : Duration,
-                    VaryByCustom          = VaryByCustom ?? cacheProfile.VaryByCustom,
-                    VaryByParam           = VaryByParam ?? cacheProfile.VaryByParam,
-                    Location              = (int)Location == -1 ? ((int)cacheProfile.Location == -1 ? OutputCacheLocation.Server : cacheProfile.Location) : Location,
-                    NoStore               = _noStore.HasValue ? _noStore.Value : cacheProfile.NoStore,
-                    IgnorePostData        = IgnorePostData,
-                    IgnoreQueryStringData = IgnoreQueryStringData,
+                    IsCachingEnabled = _cacheSettingsManager.IsCachingEnabledGlobally && cacheProfile.Enabled,
+                    Duration         = Duration == -1 ? cacheProfile.Duration : Duration,
+                    VaryByCustom     = VaryByCustom ?? cacheProfile.VaryByCustom,
+                    VaryByParam      = VaryByParam ?? cacheProfile.VaryByParam,
+                    Location         = (int)Location == -1 ? ((int)cacheProfile.Location == -1 ? OutputCacheLocation.Server : cacheProfile.Location) : Location,
+                    NoStore          = _noStore.HasValue ? _noStore.Value : cacheProfile.NoStore,
+                    Options          = Options,
                 };
             }
 

DevTrends.MvcDonutCaching/KeyGenerator.cs

@@ -38,7 +38,7 @@ public string GenerateKey(ControllerContext context, CacheSettings cacheSettings
             {
                 // note that route values take priority over form values and form values take priority over query string values
 
-                if (!cacheSettings.IgnorePostData)
+                if ((cacheSettings.Options & OutputCacheOptions.IgnoreFormData) != OutputCacheOptions.IgnoreFormData)
                 {
                     foreach (var formKey in context.HttpContext.Request.Form.AllKeys)
                     {
@@ -57,7 +57,7 @@ public string GenerateKey(ControllerContext context, CacheSettings cacheSettings
                     } 
                 }
 
-                if (!cacheSettings.IgnoreQueryStringData)
+                if ((cacheSettings.Options & OutputCacheOptions.IgnoreQueryString) != OutputCacheOptions.IgnoreQueryString)
                 {
                     foreach (var queryStringKey in context.HttpContext.Request.QueryString.AllKeys)
                     {

DevTrends.MvcDonutCaching/MvcDonutCaching.csproj

@@ -87,6 +87,7 @@
     <Compile Include="MemoryCacheProvider.cs" />
     <Compile Include="OutputCache.cs" />
     <Compile Include="OutputCacheManager.cs" />
+    <Compile Include="OutputCacheOptions.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

DevTrends.MvcDonutCaching/OutputCacheOptions.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace DevTrends.MvcDonutCaching
+{
+    [Flags]
+    public enum OutputCacheOptions
+    {
+        None                  = 0x0,
+        IgnoreQueryString = 0x1,
+        IgnoreFormData        = 0x2,
+    }
+}