Merge branch 'master' of https://github.com/madskristensen/WebCompiler.git

Author: madskristensen

src/WebCompiler/Minify/FileMinifier.cs

@@ -39,8 +39,7 @@ private static MinificationResult MinifyJavaScript(Config config, string file)
 
             var minifier = new Minifier();
 
-            string ext = Path.GetExtension(file);
-            string minFile = file.Substring(0, file.LastIndexOf(ext)) + ".min" + ext;
+            string minFile = GetMinFileName(file);
             string mapFile = minFile + ".map";
 
             string result = minifier.MinifyJavaScript(content, settings);
@@ -98,7 +97,14 @@ private static MinificationResult MinifyCss(Config config, string file)
         private static string GetMinFileName(string file)
         {
             string ext = Path.GetExtension(file);
-            return file.Substring(0, file.LastIndexOf(ext)) + ".min" + ext;
+
+            string fileName = file.Substring(0, file.LastIndexOf(ext));
+            if (!fileName.EndsWith(".min"))
+            {
+                fileName += ".min";
+            }
+
+            return fileName + ext;
         }
 
         private static void GzipFile(Config config, string sourceFile, bool containsChanges)

src/WebCompilerTest/Minify/CssMinifierTests.cs

@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WebCompiler;
+
+namespace WebCompilerTest.Minify
+{
+    [TestClass]
+    public class CssMinifierTests
+    {
+        private const string processingConfigFile = "../../Minify/artifacts/css/";
+
+        /// <summary>
+        /// Tests that '.min' is automatically appended to a minified file name.
+        /// </summary>
+        /// <remarks>
+        /// For example, the file 'site.css' becomes 'site.min.css' when minified.
+        /// </remarks>
+        [TestMethod, TestCategory("CssMinifier")]
+        public void ShouldAppendMinToOutputFile()
+        {
+            var configPath = Path.Combine(processingConfigFile, "outputfilenomin.json");
+            var configs = ConfigHandler.GetConfigs(configPath);
+            var outputFile = "site.min.css";
+
+            // Capture the name of the resulting (minified) file.
+            string resultFile = string.Empty;
+            FileMinifier.BeforeWritingMinFile += (object sender, MinifyFileEventArgs e) => { resultFile = new FileInfo(e.ResultFile).Name; };
+
+            ConfigFileProcessor processor = new ConfigFileProcessor();
+            var results = processor.Process(configPath, configs, force:true);
+
+            Assert.AreEqual(outputFile, resultFile);
+        }
+
+        /// <summary>
+        /// Tests that '.min' is only appended to a minified file name once.
+        /// </summary>
+        /// <remarks>
+        /// For example, the file 'site.min.css' remains unchanged when minified
+        /// as it already contains the '.min' suffix.
+        /// </remarks>
+        [TestMethod, TestCategory("CssMinifier")]
+        public void ShouldAppendMinOnlyOnce()
+        {
+            var configPath = Path.Combine(processingConfigFile, "outputfilemin.json");
+            var configs = ConfigHandler.GetConfigs(configPath);
+            var outputFile = configs.First().OutputFile;
+
+            // Capture the name of the resulting (minified) file.
+            string resultFile = string.Empty;
+            FileMinifier.BeforeWritingMinFile += (object sender, MinifyFileEventArgs e) => { resultFile = new FileInfo(e.ResultFile).Name; };
+
+            ConfigFileProcessor processor = new ConfigFileProcessor();
+            var results = processor.Process(configPath, configs, force: true);
+
+            Assert.AreEqual(outputFile, resultFile);
+        }
+    }
+}

src/WebCompilerTest/Minify/JavaScriptMinifierTests.cs

@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WebCompiler;
+
+namespace WebCompilerTest.Minify
+{
+    [TestClass]
+    public class JavaScriptMinifierTests
+    {
+        private const string processingConfigFile = "../../Minify/artifacts/javascript/";
+
+        /// <summary>
+        /// Tests that '.min' is automatically appended to a minified file name.
+        /// </summary>
+        /// <remarks>
+        /// For example, the file 'site.js' becomes 'site.min.js' when minified.
+        /// </remarks>
+        [TestMethod, TestCategory("JavaScriptMinifier")]
+        public void ShouldAppendMinToOutputFile()
+        {
+            var configPath = Path.Combine(processingConfigFile, "outputfilenomin.json");
+            var configs = ConfigHandler.GetConfigs(configPath);
+            var outputFile = "site.min.js";
+
+            // Capture the name of the resulting (minified) file.
+            string resultFile = string.Empty;
+            FileMinifier.BeforeWritingMinFile += (object sender, MinifyFileEventArgs e) => { resultFile = new FileInfo(e.ResultFile).Name; };
+
+            ConfigFileProcessor processor = new ConfigFileProcessor();
+            var results = processor.Process(configPath, configs, force:true);
+
+            Assert.AreEqual(outputFile, resultFile);
+        }
+
+        /// <summary>
+        /// Tests that '.min' is only appended to a minified file name once.
+        /// </summary>
+        /// <remarks>
+        /// For example, the file 'site.min.js' remains unchanged when minified
+        /// as it already contains the '.min' suffix.
+        /// </remarks>
+        [TestMethod, TestCategory("JavaScriptMinifier")]
+        public void ShouldAppendMinOnlyOnce()
+        {
+            var configPath = Path.Combine(processingConfigFile, "outputfilemin.json");
+            var configs = ConfigHandler.GetConfigs(configPath);
+            var outputFile = configs.First().OutputFile;
+
+            // Capture the name of the resulting (minified) file.
+            string resultFile = string.Empty;
+            FileMinifier.BeforeWritingMinFile += (object sender, MinifyFileEventArgs e) => { resultFile = new FileInfo(e.ResultFile).Name; };
+
+            ConfigFileProcessor processor = new ConfigFileProcessor();
+            var results = processor.Process(configPath, configs, force: true);
+
+            Assert.AreEqual(outputFile, resultFile);
+        }
+    }
+}

src/WebCompilerTest/Minify/artifacts/css/minify.less

@@ -0,0 +1,2 @@
+body {
+}

src/WebCompilerTest/Minify/artifacts/css/outputfilemin.json

@@ -0,0 +1,6 @@
+[
+  {
+    "outputFile": "site.min.css",
+    "inputFile": "minify.less"
+  }
+]

src/WebCompilerTest/Minify/artifacts/css/outputfilenomin.json

@@ -0,0 +1,6 @@
+[
+  {
+    "outputFile": "site.css",
+    "inputFile": "minify.less"
+  }
+]

src/WebCompilerTest/Minify/artifacts/javascript/minify.js

@@ -0,0 +1,3 @@
+function myfunction() {
+    
+}

src/WebCompilerTest/Minify/artifacts/javascript/outputfilemin.json

@@ -0,0 +1,6 @@
+[
+  {
+    "outputFile": "site.min.js",
+    "inputFile": "minify.js"
+  }
+]

src/WebCompilerTest/Minify/artifacts/javascript/outputfilenomin.json

@@ -0,0 +1,6 @@
+[
+  {
+    "outputFile": "site.js",
+    "inputFile": "minify.js"
+  }
+]

src/WebCompilerTest/WebCompilerTest.csproj

@@ -67,6 +67,8 @@
     <Compile Include="Compile\LessTest.cs" />
     <Compile Include="Minify\JavaScriptOptionsTests.cs" />
     <Compile Include="Minify\CssOptionsTests.cs" />
+    <Compile Include="Minify\CssMinifierTests.cs" />
+    <Compile Include="Minify\JavaScriptMinifierTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -113,10 +115,16 @@
     <None Include="artifacts\stylus\error.styl" />
     <None Include="artifacts\stylus\vendor.styl" />
     <None Include="artifacts\stylus\a.styl" />
+    <None Include="Minify\artifacts\css\minify.less" />
     <None Include="Minify\artifacts\javascript\evantreatmentmakeallsafeuppercase.json" />
     <None Include="Minify\artifacts\javascript\evantreatmentmakeimmediatesafe.json" />
     <None Include="Minify\artifacts\javascript\evantreatmentmakeallsafe.json" />
     <None Include="Minify\artifacts\javascript\evantreatmentignore.json" />
+    <Content Include="Minify\artifacts\javascript\minify.js" />
+    <None Include="Minify\artifacts\css\outputfilemin.json" />
+    <None Include="Minify\artifacts\javascript\outputfilemin.json" />
+    <None Include="Minify\artifacts\css\outputfilenomin.json" />
+    <None Include="Minify\artifacts\javascript\outputfilenomin.json" />
     <None Include="Minify\artifacts\javascript\indentsize.json" />
     <None Include="Minify\artifacts\javascript\outputmodemultiplelines.json" />
     <None Include="Minify\artifacts\javascript\outputmodemultiplelineslowercase.json" />