Fixed KeyBuilder stem issue

Split IOutputCacheManager interface

Author: DevTrends

DevTrends.MvcDonutCaching/CacheSettingsManager.cs

@@ -20,10 +20,8 @@ public string RetrieveOutputCacheProviderType()
             {
                 return null;
             }
-            else
-            {
-                return _outputCacheSection.Providers[_outputCacheSection.DefaultProviderName].Type;
-            }
+
+            return _outputCacheSection.Providers[_outputCacheSection.DefaultProviderName].Type;
         }
 
         public OutputCacheProfile RetrieveOutputCacheProfile(string cacheProfileName)

DevTrends.MvcDonutCaching/DevTrends.MvcDonutCaching.csproj

@@ -52,6 +52,7 @@
     <Compile Include="ActionSettingsSerialiser.cs" />
     <Compile Include="CacheSettings.cs" />
     <Compile Include="CacheSettingsManager.cs" />
+    <Compile Include="IExtendedOutputCacheManager.cs" />
     <Compile Include="DonutHoleFiller.cs" />
     <Compile Include="IActionOutputBuilder.cs" />
     <Compile Include="IActionSettingsSerialiser.cs" />

DevTrends.MvcDonutCaching/DonutOutputCacheAttribute.cs

@@ -9,7 +9,7 @@ public class DonutOutputCacheAttribute : ActionFilterAttribute
         private readonly IKeyGenerator _keyGenerator;
         private readonly IDonutHoleFiller _donutHoleFiller;
         private readonly IActionOutputBuilder _actionOutputBuilder;
-        private readonly IOutputCacheManager _outputCacheManager;
+        private readonly IExtendedOutputCacheManager _outputCacheManager;
         private readonly ICacheSettingsManager _cacheSettingsManager;
 
         private CacheSettings _cacheSettings;
@@ -23,15 +23,15 @@ public class DonutOutputCacheAttribute : ActionFilterAttribute
         public DonutOutputCacheAttribute()
         {
             var keyBuilder = new KeyBuilder();
-            _keyGenerator = new KeyGenerator(keyBuilder); ;
+            _keyGenerator = new KeyGenerator(keyBuilder);
             _donutHoleFiller = new DonutHoleFiller(new ActionSettingsSerialiser());
             _actionOutputBuilder = new ActionOutputBuilder();
             _outputCacheManager = new OutputCacheManager(OutputCache.Instance, keyBuilder);
             _cacheSettingsManager = new CacheSettingsManager();
         }
 
         internal DonutOutputCacheAttribute(IKeyGenerator keyGenerator, IDonutHoleFiller donutHoleFiller, IActionOutputBuilder actionOutputBuilder, 
-                                           IOutputCacheManager outputCacheManager, ICacheSettingsManager cacheSettingsManager)
+                                           IExtendedOutputCacheManager outputCacheManager, ICacheSettingsManager cacheSettingsManager)
         {
             _keyGenerator = keyGenerator;
             _donutHoleFiller = donutHoleFiller;
@@ -86,18 +86,16 @@ private CacheSettings BuildCacheSettings()
                     VaryByParam = VaryByParam
                 };                
             }
-            else
-            {
-                var cacheProfile = _cacheSettingsManager.RetrieveOutputCacheProfile(CacheProfile);
 
-                return new CacheSettings
-                {
-                    IsCachingEnabled = _cacheSettingsManager.IsCachingEnabledGlobally && cacheProfile.Enabled,
-                    Duration = Duration == 0 ? cacheProfile.Duration : Duration,
-                    VaryByCustom = VaryByCustom ?? cacheProfile.VaryByCustom,
-                    VaryByParam = VaryByParam ?? cacheProfile.VaryByParam
-                };
-            }
+            var cacheProfile = _cacheSettingsManager.RetrieveOutputCacheProfile(CacheProfile);
+
+            return new CacheSettings
+            {
+                IsCachingEnabled = _cacheSettingsManager.IsCachingEnabledGlobally && cacheProfile.Enabled,
+                Duration = Duration == 0 ? cacheProfile.Duration : Duration,
+                VaryByCustom = VaryByCustom ?? cacheProfile.VaryByCustom,
+                VaryByParam = VaryByParam ?? cacheProfile.VaryByParam
+            };
         }    
     }
 }

DevTrends.MvcDonutCaching/IExtendedOutputCacheManager.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace DevTrends.MvcDonutCaching
+{
+    internal interface IExtendedOutputCacheManager : IOutputCacheManager
+    {
+        void AddItem(string key, object entry, DateTime utcExpiry);
+        string GetItem(string key);
+    }
+}

DevTrends.MvcDonutCaching/IOutputCacheManager.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Web.Routing;
 
 namespace DevTrends.MvcDonutCaching
 {
     public interface IOutputCacheManager
     {
-        void AddItem(string key, object entry, DateTime utcExpiry);
-        string GetItem(string key);
+        void RemoveItem(string controllerName, string actionName);
+        void RemoveItem(string controllerName, string actionName, object routeValues);
+        void RemoveItem(string controllerName, string actionName, RouteValueDictionary routeValues);
+        void RemoveItems();
+        void RemoveItems(string controllerName);
+        void RemoveItems(string controllerName, string actionName);        
     }
 }

DevTrends.MvcDonutCaching/KeyBuilder.cs

@@ -23,19 +23,19 @@ public string BuildKey(string controllerName, string actionName, RouteValueDicti
 
             if (controllerName != null)
             {
-                builder.Append(controllerName.ToLowerInvariant());
+                builder.AppendFormat("{0}.", controllerName.ToLowerInvariant());
             }
 
             if (actionName != null)
             {
-                builder.AppendFormat(".{0}", actionName.ToLowerInvariant());
+                builder.AppendFormat("{0}#", actionName.ToLowerInvariant());
             }
 
             if (routeValues != null)
             {
                 foreach (var routeValue in routeValues)
                 {
-                    builder.AppendFormat("#{0}={1}", routeValue.Key.ToLowerInvariant(), routeValue.Value.ToString().ToLowerInvariant());
+                    builder.AppendFormat("{0}={1}#", routeValue.Key.ToLowerInvariant(), routeValue.Value.ToString().ToLowerInvariant());
                 }
             }
 

DevTrends.MvcDonutCaching/OutputCacheManager.cs

@@ -6,7 +6,7 @@
 
 namespace DevTrends.MvcDonutCaching
 {
-    public class OutputCacheManager : IOutputCacheManager
+    public class OutputCacheManager : IExtendedOutputCacheManager
     {
         private readonly OutputCacheProvider _outputCacheProvider;
         private readonly IKeyBuilder _keyBuilder;

DevTrends.MvcDonutCaching/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ebcc3291-f04a-4511-b7eb-ddf57a74ada9")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]