Added Html.RenderAction support

Added NoStore support
Changed priority order of POST/GET values
Made CacheItem serialisable - for Memcached

Author: DevTrends

DevTrends.MvcDonutCaching/ActionSettingsSerialiser.cs

@@ -2,7 +2,6 @@
 using System.Runtime.Serialization;
 using System.Text;
 using System.Web.Routing;
-using System.Web.Script.Serialization;
 
 namespace DevTrends.MvcDonutCaching
 {

DevTrends.MvcDonutCaching/CacheHeadersHelper.cs

@@ -29,6 +29,11 @@ public void SetCacheHeaders(HttpResponseBase response, CacheSettings settings)
                 response.Cache.SetExpires(DateTime.Now.AddSeconds(settings.Duration));
                 response.Cache.SetMaxAge(new TimeSpan(0, 0, settings.Duration));
             }
+
+            if (settings.NoStore)
+            {
+                response.Cache.SetNoStore();
+            }
         }
     }
 }

DevTrends.MvcDonutCaching/CacheItem.cs

@@ -1,6 +1,8 @@
-
+using System;
+
 namespace DevTrends.MvcDonutCaching
 {
+    [Serializable]
     public class CacheItem
     {
         public string Content { get; set; }

DevTrends.MvcDonutCaching/CacheSettings.cs

@@ -9,14 +9,15 @@ public class CacheSettings
         public string VaryByParam { get; set; }
         public string VaryByCustom { get; set; }
         public OutputCacheLocation Location { get; set; }
+        public bool NoStore { get; set; }
 
         public bool IsServerCachingEnabled
         {
             get
             {
                 return IsCachingEnabled && Duration > 0 && (Location == OutputCacheLocation.Any || 
                                                             Location == OutputCacheLocation.Server || 
-                                                            Location == OutputCacheLocation.ServerAndClient);
+                                                            Location == OutputCacheLocation.ServerAndClient);                
             }
         }
     }

DevTrends.MvcDonutCaching/DonutHoleFiller.cs

@@ -30,7 +30,7 @@ public string RemoveDonutHoleWrappers(string content, ControllerContext filterCo
                 return content;
             }
 
-            return DonutHoles.Replace(content, new MatchEvaluator(match => match.Groups[2].Value));
+            return DonutHoles.Replace(content, match => match.Groups[2].Value);
         }
 
         public string ReplaceDonutHoleContent(string content, ControllerContext filterContext)
@@ -40,12 +40,12 @@ public string ReplaceDonutHoleContent(string content, ControllerContext filterCo
                 return content;
             }
 
-            return DonutHoles.Replace(content, new MatchEvaluator(match =>
+            return DonutHoles.Replace(content, match =>
             {
                 var actionSettings = _actionSettingsSerialiser.Deserialise(match.Groups[1].Value);
 
                 return InvokeAction(filterContext.Controller, actionSettings.ActionName, actionSettings.ControllerName, actionSettings.RouteValues);
-            }));
+            });
         }
 
         private static string InvokeAction(ControllerBase controller, string actionName, string controllerName, RouteValueDictionary routeValues)
@@ -58,4 +58,4 @@ private static string InvokeAction(ControllerBase controller, string actionName,
             return htmlHelper.Action(actionName, controllerName, routeValues).ToString();
         }
     }
-}
+}

DevTrends.MvcDonutCaching/DonutOutputCacheAttribute.cs

@@ -16,13 +16,20 @@ public class DonutOutputCacheAttribute : ActionFilterAttribute, IExceptionFilter
         private readonly ICacheSettingsManager _cacheSettingsManager;
         private readonly ICacheHeadersHelper _cacheHeadersHelper;
 
+        private bool? _noStore;
         private CacheSettings _cacheSettings;
 
         public int Duration { get; set; }
         public string VaryByParam { get; set; }
         public string VaryByCustom { get; set; }
         public string CacheProfile { get; set; }
         public OutputCacheLocation Location { get; set; }
+        
+        public bool NoStore 
+        {
+            get { return _noStore ?? false; }
+            set { _noStore = value; }
+        }
 
         public DonutOutputCacheAttribute()
         {
@@ -133,7 +140,8 @@ private CacheSettings BuildCacheSettings()
                     Duration = Duration,
                     VaryByCustom = VaryByCustom,
                     VaryByParam = VaryByParam,
-                    Location = (int)Location == -1 ? OutputCacheLocation.Server : Location
+                    Location = (int)Location == -1 ? OutputCacheLocation.Server : Location,
+                    NoStore = NoStore
                 };
             }
             else
@@ -146,7 +154,8 @@ private CacheSettings BuildCacheSettings()
                     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
+                    Location = (int)Location == -1 ? ((int)cacheProfile.Location == -1 ? OutputCacheLocation.Server : cacheProfile.Location) : Location,
+                    NoStore = _noStore.HasValue ? _noStore.Value : cacheProfile.NoStore
                 };
             }