Updated conditional comments with Andrew's recommendations

ryansroberts · Mar 5, 2012 · 5bdfaa3 · 5bdfaa3
1 parent 4ff1bb8
commit 5bdfaa3
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 11 deletions.
diff --git a/src/Cassette.IntegrationTests/CassetteApplication.cs b/src/Cassette.IntegrationTests/CassetteApplication.cs
@@ -35,6 +35,19 @@ public CassetteApplicationTests()
         readonly Mock<HttpContextBase> httpContext;
         readonly Dictionary<string, object> httpContextItems;
 
+        [Fact]
+        public void MhtmlStylesheetHasCorrectContentType()
+        {
+            using (CreateApplication(bundles => bundles.Add<StylesheetBundle>("Styles", b => b.Processor = new StylesheetPipeline().EmbedImages(ImageEmbedType.Mhtml))))
+            {
+                using (var http = new HttpTestHarness(routes))
+                {
+                    http.Get("~/_cassette/stylesheetbundle/styles");
+                    Assert.Equal<string>(http.Response.Object.ContentType,"message/rfc822");
+                }
+            }
+        }
+
         [Fact]
         public void CanGetScriptBundleA()
         {
@@ -204,6 +217,7 @@ public HttpTestHarness(RouteCollection routes)
             Response.Setup(r => r.ApplyAppPathModifier(It.IsAny<string>())).Returns<string>(r => r);
             Response.SetupGet(r => r.OutputStream).Returns(ResponseOutputStream);
             Response.SetupGet(r => r.Cache).Returns(ResponseCache.Object);
+            Response.SetupProperty(r => r.ContentType);
         }
 
         RouteCollection routes;

diff --git a/src/Cassette/Bundle.cs b/src/Cassette/Bundle.cs
@@ -114,8 +114,6 @@ internal void Process(CassetteSettings settings)
             IsProcessed = true;
         }
 
-        internal ConditionalRenderer ConditionalRenderer { get { return conditionalRenderer; } }
-
         protected abstract void ProcessCore(CassetteSettings settings);
 
         internal bool IsProcessed { get; private set; }

diff --git a/src/Cassette/Scripts/DebugScriptBundleHtmlRenderer.cs b/src/Cassette/Scripts/DebugScriptBundleHtmlRenderer.cs
@@ -27,7 +27,7 @@ public string Render(ScriptBundle bundle)
 
             if (bundle.HasCondition)
             {
-                return bundle.ConditionalRenderer.RenderCondition(bundle.Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(bundle.Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Scripts/ExternalScriptBundleHtmlRenderer.cs b/src/Cassette/Scripts/ExternalScriptBundleHtmlRenderer.cs
@@ -47,7 +47,7 @@ public string Render(ScriptBundle bundle)
 
             if (bundle.HasCondition)
             {
-                return bundle.ConditionalRenderer.RenderCondition(bundle.Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(bundle.Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Scripts/InlineScriptBundle.cs b/src/Cassette/Scripts/InlineScriptBundle.cs
@@ -30,7 +30,7 @@ internal override string Render()
 
             if (HasCondition)
             {
-                return ConditionalRenderer.RenderCondition(Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Scripts/ScriptBundle.cs b/src/Cassette/Scripts/ScriptBundle.cs
@@ -25,7 +25,7 @@ protected ScriptBundle()
         /// </summary>
         public string Condition { get; set; }
 
-        public bool HasCondition
+        internal bool HasCondition
         {
             get { return !String.IsNullOrEmpty(Condition); }
         }

diff --git a/src/Cassette/Scripts/ScriptBundleHtmlRenderer.cs b/src/Cassette/Scripts/ScriptBundleHtmlRenderer.cs
@@ -25,7 +25,7 @@ public string Render(ScriptBundle bundle)
 
             if (bundle.HasCondition)
             {
-                return bundle.ConditionalRenderer.RenderCondition(bundle.Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(bundle.Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Stylesheets/DebugStylesheetHtmlRenderer.cs b/src/Cassette/Stylesheets/DebugStylesheetHtmlRenderer.cs
@@ -27,7 +27,7 @@ public string Render(StylesheetBundle bundle)
 
             if (bundle.HasCondition)
             {
-                return bundle.ConditionalRenderer.RenderCondition(bundle.Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(bundle.Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Stylesheets/ExternalStylesheetHtmlRenderer.cs b/src/Cassette/Stylesheets/ExternalStylesheetHtmlRenderer.cs
@@ -44,7 +44,7 @@ public string Render(StylesheetBundle bundle)
 
             if (bundle.HasCondition)
             {
-                return bundle.ConditionalRenderer.RenderCondition(bundle.Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(bundle.Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Stylesheets/StylesheetBundle.cs b/src/Cassette/Stylesheets/StylesheetBundle.cs
@@ -26,7 +26,7 @@ public StylesheetBundle(string applicationRelativePath)
         /// </summary>
         public string Condition { get; set; }
 
-        public bool HasCondition
+        internal bool HasCondition
         {
             get { return !String.IsNullOrEmpty(Condition); }
         }

diff --git a/src/Cassette/Stylesheets/StylesheetHtmlRenderer.cs b/src/Cassette/Stylesheets/StylesheetHtmlRenderer.cs
@@ -36,7 +36,7 @@ public string Render(StylesheetBundle bundle)
 
             if (bundle.HasCondition)
             {
-                return bundle.ConditionalRenderer.RenderCondition(bundle.Condition, html.ToString());
+                return new ConditionalRenderer().RenderCondition(bundle.Condition, html.ToString());
             }
             else
             {

diff --git a/src/Cassette/Stylesheets/StylesheetPipelineExtensions.cs b/src/Cassette/Stylesheets/StylesheetPipelineExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using Cassette.BundleProcessing;
 
 namespace Cassette.Stylesheets
 {
@@ -14,6 +15,7 @@ public static StylesheetPipeline EmbedImages(this StylesheetPipeline pipeline, F
             if (type == ImageEmbedType.Mhtml)
             {
                 // TODO: MHTML support
+                pipeline.InsertBefore<ExpandCssUrls>(new AssignContentType("message/rfc822"));
             }
             else
             {