Additional Mono/Linux adjustments.

SparkViewEngine · Mar 21, 2011 · ef93151 · ef93151
1 parent 96837b5
commit ef93151
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Spark.Python/Compiler/PythonViewCompiler.cs b/src/Spark.Python/Compiler/PythonViewCompiler.cs
@@ -106,7 +106,7 @@ public override void GenerateSourceCode(IEnumerable<IList<Chunk>> viewTemplates,
                 source.AppendLine("    Templates = new string[] {");
                 source.Append("      ").AppendLine(string.Join(",\r\n      ",
                                                                Descriptor.Templates.Select(
-                                                                   t => "\"" + t.Replace("\\", "\\\\") + "\"").ToArray()));
+                                                                   t => "\"" + SparkViewAttribute.ConvertToAttributeFormat(t) + "\"").ToArray()));
                 source.AppendLine("    })]");
             }
 

diff --git a/src/Spark.Ruby/Compiler/RubyViewCompiler.cs b/src/Spark.Ruby/Compiler/RubyViewCompiler.cs
@@ -130,7 +130,7 @@ public override void GenerateSourceCode(IEnumerable<IList<Chunk>> viewTemplates,
                 source.AppendLine("    Templates = new string[] {");
                 source.Append("      ").AppendLine(string.Join(",\r\n      ",
                                                                Descriptor.Templates.Select(
-                                                                   t => "\"" + t.Replace("\\", "\\\\") + "\"").ToArray()));
+                                                                   t => "\"" + SparkViewAttribute.ConvertToAttributeFormat(t) + "\"").ToArray()));
                 source.AppendLine("    })]");
             }
 

diff --git a/src/Spark.Tests/SparkSectionHandlerTester.cs b/src/Spark.Tests/SparkSectionHandlerTester.cs
@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
@@ -80,16 +81,18 @@ public void UseAssemblyAndNamespaceFromSettings()
                 .AddAssembly("System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")
                 .SetPageBaseType(typeof(StubSparkView));
 
-            var views = new InMemoryViewFolder();
-            views.Add("Home\\Index.spark", "<div>${ProcessStatus.Alive}</div>");
+            var views = new InMemoryViewFolder
+            {
+                {Path.Combine("home", "index.spark"), "<div>${ProcessStatus.Alive}</div>"}
+            };
 
             var engine = new SparkViewEngine(settings) {ViewFolder = views};
 
             var descriptor = new SparkViewDescriptor();
-            descriptor.Templates.Add("home\\index.spark");
+            descriptor.Templates.Add(Path.Combine("home","index.spark"));
 
             var contents = engine.CreateInstance(descriptor).RenderView();
             Assert.AreEqual("<div>Alive</div>", contents);
         }
     }
-}
+}