Support for import from absolute path via ScssFilter

Gappa · Dec 11, 2015 · 26f735d · 26f735d
1 parent 3a8e869
commit 26f735d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/WebLoader/Filter/ScssFilter.php b/WebLoader/Filter/ScssFilter.php
@@ -44,7 +44,7 @@ private function getScssC()
 	public function __invoke($code, \WebLoader\Compiler $loader, $file)
 	{
 		if (pathinfo($file, PATHINFO_EXTENSION) === 'scss') {
-			$this->getScssC()->setImportPaths(pathinfo($file, PATHINFO_DIRNAME) . '/');
+			$this->getScssC()->setImportPaths(array('', pathinfo($file, PATHINFO_DIRNAME) . '/'));
 			return $this->getScssC()->compile($code);
 		}
 

diff --git a/tests/Filter/ScssFilterTest.php b/tests/Filter/ScssFilterTest.php
@@ -6,6 +6,7 @@
 use WebLoader\DefaultOutputNamingConvention;
 use WebLoader\FileCollection;
 use WebLoader\Filter\ScssFilter;
+use WebLoader\Filter\VariablesFilter;
 
 class ScssFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,4 +32,16 @@ public function testReplace()
 		$this->assertSame(file_get_contents(__DIR__ . '/../fixtures/style.scss.expected'), $less);
 	}
 
+	public function testImportAbsolutePath()
+	{
+		$file = __DIR__ . '/../fixtures/styleAbsolute.scss';
+		$filter = new VariablesFilter(array(
+			'fixturesAbsolutePath' => realpath(__DIR__.'/../fixtures'),
+		));
+		$code = file_get_contents($file);
+		$filtered = $filter($code);
+		$less = $this->filter->__invoke($filtered, $this->compiler, $file);
+		$this->assertSame(file_get_contents(__DIR__ . '/../fixtures/styleAbsolute.scss.expected'), $less);
+	}
+
 }
diff --git a/tests/fixtures/styleAbsolute.scss b/tests/fixtures/styleAbsolute.scss
@@ -0,0 +1,19 @@
+
+@import '{{$fixturesAbsolutePath}}/style2.scss';
+
+.navigation {
+    ul {
+        line-height: 20px;
+        color: blue;
+        a {
+            color: red;
+        }
+    }
+}
+
+.footer {
+    .copyright {
+        color: silver;
+    }
+}
+
diff --git a/tests/fixtures/styleAbsolute.scss.expected b/tests/fixtures/styleAbsolute.scss.expected
@@ -0,0 +1,12 @@
+.clearFix {
+  display: block;
+  zoom: 1; }
+
+.navigation ul {
+  line-height: 20px;
+  color: blue; }
+  .navigation ul a {
+    color: red; }
+
+.footer .copyright {
+  color: silver; }