Fixes how the file paths can be set dynamically on startup, bumps version

Author: Shazwazza

ClientDependency.Core/CompositeFiles/Providers/BaseCompositeFileProcessingProvider.cs

@@ -14,20 +14,32 @@ namespace ClientDependency.Core.CompositeFiles.Providers
 {
     public abstract class BaseCompositeFileProcessingProvider : ProviderBase, IHttpProvider
     {
+
+        private static bool _dynamicallyConfiguredPath = false;
+        private static string _compositeFilePathDefaultFolder = "~/App_Data/ClientDependency";
+
         /// <summary>
-        /// The default path for storing composite files
+        /// The default path for storing composite files, either absolute or virtual 
         /// </summary>
         /// <remarks>
         /// Can be set dynamically during startup
         /// </remarks>
-        public static string CompositeFilePathVirtualFolderDefault = "~/App_Data/ClientDependency";
+        public static string CompositeFilePathDefaultFolder
+        {
+            get { return _compositeFilePathDefaultFolder; }
+            set
+            {
+                _compositeFilePathDefaultFolder = value;
+                _dynamicallyConfiguredPath = true;
+            }
+        }
 
         /// <summary>
         /// Defines the UrlType default value, this can be set at startup
         /// </summary>
         public static CompositeUrlType UrlTypeDefault = CompositeUrlType.MappedId;
-        
-        public string CompositeFilePathVirtualFolder { get; private set; } = CompositeFilePathVirtualFolderDefault;
+
+        public string CompositeFilePathFolder { get; private set; } 
 
         /// <summary>
         /// constructor sets defaults
@@ -40,6 +52,7 @@ protected BaseCompositeFileProcessingProvider()
             UrlType = UrlTypeDefault;
             PathBasedUrlFormat = "{dependencyId}/{version}/{type}";
             BundleDomains = new List<string>();
+            CompositeFilePathFolder = CompositeFilePathDefaultFolder;
         }
 
         #region Public Properties
@@ -89,7 +102,9 @@ protected BaseCompositeFileProcessingProvider()
 
         public void Initialize(HttpContextBase http)
         {
-            CompositeFilePath = new DirectoryInfo(http.Server.MapPath(CompositeFilePathVirtualFolder));
+            CompositeFilePath = CompositeFilePathFolder.StartsWith("~/")
+                ? new DirectoryInfo(http.Server.MapPath(CompositeFilePathFolder))
+                : new DirectoryInfo(CompositeFilePathFolder);
         }
 
         #endregion
@@ -550,12 +565,10 @@ public override void Initialize(string name, System.Collections.Specialized.Name
 
             if (config["compositeFilePath"] != null)
             {
-                //use the config setting if it has not been dynamically set OR
-                //when the config section doesn't equal the default
-                if (CompositeFilePathVirtualFolder == CompositeFilePathVirtualFolderDefault
-                    || config["compositeFilePath"] != CompositeFilePathVirtualFolderDefault)
+                //use the config setting if it has not been dynamically set 
+                if (!_dynamicallyConfiguredPath)
                 {
-                    CompositeFilePathVirtualFolder = config["compositeFilePath"];
+                    CompositeFilePathFolder = config["compositeFilePath"];
                 }
             }
 

ClientDependency.Core/CompositeFiles/Providers/XmlFileMapper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -31,24 +32,50 @@ public class XmlFileMapper : BaseFileMapProvider
         private FileInfo _xmlFile;
 
         private static readonly object Locker = new object();
+        private static string _fileMapFolder = "~/App_Data/ClientDependency";
+        private static bool _dynamicallyConfiguredPath = false;
+
+        [Obsolete("Use FileMapDefaultFolder instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static string FileMapVirtualFolder
+        {
+            get { return FileMapDefaultFolder; }
+            set { FileMapDefaultFolder = value; }
+        }
 
         /// <summary>
-        /// Specifies the default folder to store the file map in
+        /// Specifies the default folder to store the file map in, either absolute or virtual 
         /// </summary>
         /// <remarks>
         /// allows for dynamically changing the folder on startup
         /// </remarks>
-        public static string FileMapVirtualFolder = "~/App_Data/ClientDependency";
+        public static string FileMapDefaultFolder
+        {
+            get { return _fileMapFolder; }
+            set
+            {
+                _fileMapFolder = value;
+                _dynamicallyConfiguredPath = true;
+            }
+        }
 
-        public string FileMapFolder { get; private set; } = FileMapVirtualFolder;
+        public string FileMapFolder { get; private set; }
 
         private DirectoryInfo _xmlMapFolder;
 
+        public XmlFileMapper()
+        {
+            FileMapFolder = FileMapDefaultFolder;
+        }
+
         public override void Initialize(HttpContextBase http)
         {
             if (http == null) throw new ArgumentNullException("http");
 
-            _xmlMapFolder = new DirectoryInfo(http.Server.MapPath(FileMapFolder));
+            //check for a virtual path before MapPath
+            _xmlMapFolder = FileMapFolder.StartsWith("~/")
+                ? new DirectoryInfo(http.Server.MapPath(FileMapFolder))
+                : new DirectoryInfo(FileMapFolder);
 
             //Name the map file according to the machine name
             _xmlFile = new FileInfo(GetXmlMapPath());
@@ -82,10 +109,8 @@ public override void Initialize(string name, System.Collections.Specialized.Name
 
             if (config["mapPath"] != null)
             {
-                //use the config setting if it has not been dynamically set OR
-                //when the config section doesn't equal the default
-                if (FileMapFolder == FileMapVirtualFolder
-                    || config["mapPath"] != FileMapVirtualFolder)
+                //use the config setting if it has not been dynamically set
+                if (!_dynamicallyConfiguredPath)
                 {
                     FileMapFolder = config["mapPath"];
                 }

ClientDependency.UnitTests/ClientDependencySettingsTest.cs

@@ -67,8 +67,8 @@ public void Settings_Legacy_Pre_13()
             Assert.AreEqual(1, settings.ConfigSection.CompositeFileElement.MimeTypeCompression.Count);
             Assert.AreEqual(0, settings.ConfigSection.CompositeFileElement.RogueFileCompression.Count);
 
-            Assert.AreEqual(settings.DefaultCompositeFileProcessingProvider.CompositeFilePathVirtualFolder, "~/App_Data/TEMP/ClientDependency");
-            Assert.AreEqual(settings.DefaultCompositeFileProcessingProvider.CompositeFilePathVirtualFolder, XmlFileMapper.FileMapVirtualFolder);
+            Assert.AreEqual(settings.DefaultCompositeFileProcessingProvider.CompositeFilePathFolder, "~/App_Data/TEMP/ClientDependency");
+            Assert.AreEqual(settings.DefaultCompositeFileProcessingProvider.CompositeFilePathFolder, XmlFileMapper.FileMapVirtualFolder);
             Assert.AreEqual(CompositeUrlType.Base64QueryStrings, settings.DefaultCompositeFileProcessingProvider.UrlType);
         }
 

SolutionInfo.cs

@@ -9,4 +9,4 @@
 
 [assembly: AssemblyVersion("1.9.4")]
 [assembly: AssemblyFileVersion("1.9.4")]
-[assembly: AssemblyInformationalVersion("1.9.4-beta")]
+[assembly: AssemblyInformationalVersion("1.9.4-beta02")]