[CacheControl] Fixed test; added argument for cache output

CacheControl-test/CacheControl-test.csproj

@@ -155,6 +155,7 @@
     <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
     <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
     <Compile Include="Controllers\HomeController.cs" />
+    <Compile Include="Controllers\MyCacheOutputAttribute.cs" />
     <Compile Include="Controllers\ValuesController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>

CacheControl-test/Controllers/MyCacheOutputAttribute.cs

@@ -0,0 +1,15 @@
+using System.IO;
+using iiie.CacheControl.Business.Attributes;
+using iiie.CacheControl.Business.OutputCache;
+
+namespace CacheControl_test.Controllers
+{
+    public class MyCacheOutputAttribute : TimeCacheControlAttribute
+    {
+        public MyCacheOutputAttribute(int seconds) : base(seconds)
+        {
+            CacheOutputData = Path.Combine(Path.GetTempPath(), "cache-control-test");
+            CacheType = OutputCacheType.File;
+        }
+    }
+}

CacheControl-test/Controllers/ValuesController.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Web.Http;
-using iiie.CacheControl.Business.Attributes;
-using iiie.CacheControl.Business.OutputCache;
 
 namespace CacheControl_test.Controllers
 {
@@ -14,7 +12,7 @@ namespace CacheControl_test.Controllers
         }
 
         // GET api/values/5
-        [TimeCacheControl(60, true, false, OutputCacheType.File)]
+        [MyCacheOutput(60)]
         public string Get(int id)
         {
             return "value";

CacheControl/Business/Attributes/CacheControlAttribute.cs

@@ -27,6 +27,11 @@ namespace iiie.CacheControl.Attributes
         /// </summary>
         protected bool MustRevalidate { get; set; }
 
+        /// <summary>
+        /// Data used by OutputCache
+        /// </summary>
+        protected object CacheOutputData { get; set; }
+
         /// <summary>
         /// Indicates if the query string must be used to control cache
         /// </summary>
@@ -45,7 +50,7 @@ namespace iiie.CacheControl.Attributes
 
         protected void EnsureCache(HttpConfiguration config, HttpRequestMessage req)
         {
-            _webCache = config.CacheOutputConfiguration(CacheType).GetCacheOutputProvider(req);
+            _webCache = config.CacheOutputConfiguration(CacheType).GetCacheOutputProvider(req, CacheOutputData);
         }
 
         protected abstract bool IsValid(CacheDbo data);

CacheControl/Business/Attributes/TimeCacheControlAttribute.cs

@@ -18,17 +18,9 @@ namespace iiie.CacheControl.Business.Attributes
         /// <summary>
         /// Contruct a cache control based on time
         /// </summary>
-        /// <param name="seconds">The number of seconds the cache is valid</param>
-        /// <param name="mustRevalidate">Indicates if the client can reuse cached data without asking origin server</param>
-        /// <param name="excludeQueryStringFromCacheKey">Indicates if the query string must be used to control cache</param>
-        /// <param name="cacheType">Define the cache type used to store cache</param>
-        public TimeCacheControlAttribute(int seconds, bool mustRevalidate = true,
-            bool excludeQueryStringFromCacheKey = false, OutputCacheType cacheType = OutputCacheType.Memory)
+        public TimeCacheControlAttribute(int seconds)
         {
             Seconds = seconds;
-            MustRevalidate = mustRevalidate;
-            ExcludeQueryStringFromCacheKey = excludeQueryStringFromCacheKey;
-            CacheType = cacheType;
         }
 
         /// <summary>

CacheControl/Business/HttpExtensions/CacheOutputConfiguration.cs

@@ -89,7 +89,7 @@ namespace iiie.CacheControl.Business.HttpExtensions
                 ?? new DefaultCacheKeyGenerator();
         }
 
-        public IOutputCache GetCacheOutputProvider(HttpRequestMessage request)
+        public IOutputCache GetCacheOutputProvider(HttpRequestMessage request, object cacheOutputData)
         {
             object cache;
             _configuration.Properties.TryGetValue(typeof(IOutputCache), out cache);
@@ -100,7 +100,7 @@ namespace iiie.CacheControl.Business.HttpExtensions
             if (cacheOutputProvider == null)
             {
                 if (_cacheType == OutputCacheType.File)
-                    cacheOutputProvider = new FileOuputCache();
+                    cacheOutputProvider = new FileOuputCache(cacheOutputData as string);
                 else
                     cacheOutputProvider = new MemoryOutputCache();
             }

CacheControl/Business/OutputCache/FileOuputCache.cs

@@ -7,9 +7,11 @@ namespace iiie.CacheControl.Business.OutputCache
 {
     public class FileOuputCache : IOutputCache
     {
-        public string TempPath
+        private string TempPath { get; set; }
+
+        public FileOuputCache(string tempPath)
         {
-            get { return Path.Combine(Path.GetTempPath(), "co-planningCache"); }
+            TempPath = tempPath;
         }
 
         public string GetPath(string key)