made sassandcoffee nuget dependency

zangai · Feb 28, 2012 · e8ced7b · e8ced7b
1 parent 5a113ef
commit e8ced7b
Show file tree

Hide file tree

Showing 103 changed files with 6,510 additions and 262 deletions.
diff --git a/Demo/BadSyntax.css b/Demo/BadSyntax.css
@@ -3,7 +3,7 @@
  * !!! AUTOMATICALLY GENERATED CODE !!!
  * -------------------------------------------------------------------------
  * This file was automatically generated by the OrangeBits compiler.  
- * Compiled on:  2/9/2012 6:00:04 PM
+ * Compiled on:  2/27/2012 10:32:21 PM
  * Compiled by: REDMOND\justbe
  * Source: C:\Users\justbe\Dropbox\Code\OrangeBits\Demo\BadSyntax.less      
  * -------------------------------------------------------------------------*/

diff --git a/Demo/BadSyntax.sass b/Demo/BadSyntax.sass
@@ -0,0 +1 @@
+this is bad syntax!
diff --git a/Demo/BadSyntax.scss b/Demo/BadSyntax.scss
@@ -0,0 +1,3 @@
+this 
+is 
+bad syntax 
diff --git a/Demo/lessTest.css b/Demo/lessTest.css
@@ -3,7 +3,7 @@
  * !!! AUTOMATICALLY GENERATED CODE !!!
  * -------------------------------------------------------------------------
  * This file was automatically generated by the OrangeBits compiler.  
- * Compiled on:  2/9/2012 5:57:51 PM
+ * Compiled on:  2/27/2012 10:55:25 PM
  * Compiled by: REDMOND\justbe
  * Source: C:\Users\justbe\Dropbox\Code\OrangeBits\Demo\lessTest.less      
  * -------------------------------------------------------------------------*/

diff --git a/Demo/lessTest.less b/Demo/lessTest.less
@@ -17,4 +17,4 @@
   color: darken(@purple, 12%);
   padding: @margin / 2;
   margin: @margin / 2;
-}  
+} 
diff --git a/Demo/sassTest.css b/Demo/sassTest.css
@@ -1,3 +1,14 @@
+
+/* -------------------------------------------------------------------------
+ * !!! AUTOMATICALLY GENERATED CODE !!!
+ * -------------------------------------------------------------------------
+ * This file was automatically generated by the OrangeBits compiler.  
+ * Compiled on:  2/27/2012 10:31:01 PM
+ * Compiled by: REDMOND\justbe
+ * Source: C:\Users\justbe\Dropbox\Code\OrangeBits\Demo\sassTest.sass      
+ * -------------------------------------------------------------------------*/
+
+
 .sassBox {
   background-color: #caeef2;
   border-color: #3bbfce;

diff --git a/Demo/stylusTest.styl b/Demo/stylusTest.styl
@@ -0,0 +1,9 @@
+body a
+  font 12px/1.3 "Lucida Grande", Arial, sans-serif
+  background black
+  color #ccc
+
+form input
+  padding 5px
+  border 1px solid
+
diff --git a/OrangeBits.sln.docstates.suo b/OrangeBits.sln.docstates.suo
diff --git a/OrangeBits.suo b/OrangeBits.suo
diff --git a/OrangeBits.v11.suo b/OrangeBits.v11.suo
diff --git a/OrangeBits/Compilers/CoffeeCompiler.cs b/OrangeBits/Compilers/CoffeeCompiler.cs
@@ -3,19 +3,19 @@
 using System.Linq;
 using System.Text;
 using System.IO;
-using SassAndCoffee.Core;
-using SassAndCoffee.Core.CoffeeScript;
-using SassAndCoffee.Core.Pipeline;
-using SassAndCoffee.Core.Pooling;
 using OrangeBits;
 
+using SassAndCoffee.Core;
+using SassAndCoffee.JavaScript;
+using SassAndCoffee.JavaScript.CoffeeScript;
+
 namespace OrangeBits.Compilers
 {
     public class CoffeeCompiler : ICompiler
     {       
         public void Compile(string inPath, string outPath)
-        {                        
-            SassAndCoffee.Core.CoffeeScript.CoffeeScriptCompiler compiler = new CoffeeScriptCompiler(new InstanceProvider<IJavaScriptRuntime>(() => new IEJavaScriptRuntime()));
+        {
+            CoffeeScriptCompiler compiler = new CoffeeScriptCompiler(new SassAndCoffee.Core.InstanceProvider<IJavaScriptRuntime>(() => new IEJavaScriptRuntime()));
             using (StreamReader sr = new StreamReader(inPath))
             {               
                 string content = sr.ReadToEnd();

diff --git a/OrangeBits/Compilers/LessCompiler.cs b/OrangeBits/Compilers/LessCompiler.cs
@@ -9,31 +9,43 @@
 using System.Security.Principal;
 
 using dotless.Core;
+using dotless.Core.Parser.Tree;
+using dotless.Core.Parser.Infrastructure;
+using dotless.Core.Exceptions;
+
 
 namespace OrangeBits.Compilers
 {
     /// <summary>
     /// 
     /// </summary>
-	public class LessCompiler : ICompiler
-	{
+    public class LessCompiler : ICompiler
+    {
         /// <summary>
         /// 
         /// </summary>
         /// <param name="inPath"></param>
         /// <param name="outPath"></param>
-		public void Compile(string inPath, string outPath) 
-		{            
-			using (StreamReader sr = new StreamReader(inPath))
-			{
-				string content = sr.ReadToEnd();
-				string output = Less.Parse(content);				
-				using (StreamWriter sw = new StreamWriter(outPath))
-				{
+        public void Compile(string inPath, string outPath)
+        {
+            using (StreamReader sr = new StreamReader(inPath))
+            {
+                string content = sr.ReadToEnd();
+                LessEngine engine = new LessEngine();
+                Ruleset ruleset = engine.Parser.Parse(content, inPath);
+                Env env = new Env();
+                env.Compress = engine.Compress;
+                Env env2 = env;
+                string output = ruleset.ToCSS(env2);
+
+                using (StreamWriter sw = new StreamWriter(outPath))
+                {
                     sw.WriteLine(OrangeBits.GetHeader(inPath));
-					sw.Write(output);
-				}
-			}
-		}
-	}
+                    sw.Write(output);
+                }
+            }
+        }
+    }
 }
+
+
diff --git a/OrangeBits/Compilers/SassCompiler.cs b/OrangeBits/Compilers/SassCompiler.cs
@@ -5,16 +5,16 @@
 using System.IO;
 using System.Security.Principal;
 
-using SassAndCoffee.Core.Sass;
+using SassAndCoffee.Core;
 
 namespace OrangeBits.Compilers
 {
     public class SassCompiler : ICompiler
     {
         public void Compile(string inPath, string outPath)
         {
-            SassAndCoffee.Core.Sass.SassCompiler compiler = new SassAndCoffee.Core.Sass.SassCompiler();
-            string output = compiler.Compile(inPath);
+            SassAndCoffee.Ruby.Sass.SassCompiler compiler = new SassAndCoffee.Ruby.Sass.SassCompiler();
+            string output = compiler.Compile(inPath, false, null);
             using (StreamWriter sw = new StreamWriter(outPath))
             {
                 sw.WriteLine(OrangeBits.GetHeader(inPath));

diff --git a/OrangeBits/OrangeBits.csproj b/OrangeBits/OrangeBits.csproj
@@ -66,9 +66,18 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="SassAndCoffee.Core, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SassAndCoffee.AspNet">
+      <HintPath>..\packages\SassAndCoffee.AspNet.2.0.2.0\lib\net40\SassAndCoffee.AspNet.dll</HintPath>
+    </Reference>
+    <Reference Include="SassAndCoffee.Core, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Code\SassAndCoffee\SassAndCoffee.Core\bin\Debug\SassAndCoffee.Core.dll</HintPath>
+      <HintPath>..\packages\SassAndCoffee.Core.2.0.2.0\lib\net40-Client\SassAndCoffee.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="SassAndCoffee.JavaScript">
+      <HintPath>..\packages\SassAndCoffee.JavaScript.2.0.2.0\lib\net40-Client\SassAndCoffee.JavaScript.dll</HintPath>
+    </Reference>
+    <Reference Include="SassAndCoffee.Ruby">
+      <HintPath>..\packages\SassAndCoffee.Ruby.2.0.2.0\lib\net40-Client\SassAndCoffee.Ruby.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />