Merge branch 'daveblake-test-scss-assets-via-dispatch'

Fixed Scss Imports

src/Assets/AbstractDispatchableAsset.php

@@ -10,13 +10,27 @@ abstract class AbstractDispatchableAsset extends AbstractAsset
    * @var AssetManager
    */
   protected $_assetManager;
+  protected $_workingDirectory;
   protected $_processedContent = false;
 
   public function setAssetManager(AssetManager $am)
   {
     $this->_assetManager = $am;
   }
 
+  /**
+   * Set the current working directory for an asset
+   *
+   * @param $directory
+   *
+   * @return static
+   */
+  public function setWorkingDirectory($directory)
+  {
+    $this->_workingDirectory = $directory;
+    return $this;
+  }
+
   /**
    * Set the asset content
    *
@@ -51,7 +65,7 @@ protected function _processContent()
     //Find all URL(.*) and dispatch their values
     $this->_content = preg_replace_callback(
       '~url\(\s*[\'"]?([^\s\'"]*?)[\'"]?\s*\)~',
-      array($this, "_dispatchNestedUrl"),
+      [$this, "_dispatchNestedUrl"],
       $this->_content
     );
 

src/Assets/IDispatchableAsset.php

@@ -13,4 +13,13 @@ interface IDispatchableAsset extends IAsset
    * @return IDispatchableAsset
    */
   public function setAssetManager(AssetManager $am);
+
+  /**
+   * Set the current working directory for an asset
+   *
+   * @param $directory
+   *
+   * @return IDispatchableAsset
+   */
+  public function setWorkingDirectory($directory);
 }

src/Assets/ScssAsset.php

@@ -21,7 +21,12 @@ public function getContent()
 
     if($this->_assetManager !== null)
     {
-      $compiler->setImportPaths($this->_assetManager->getRelativePath());
+      $compiler->setImportPaths(
+        build_path(
+          $this->_workingDirectory,
+          $this->_assetManager->getRelativePath()
+        )
+      );
     }
     return $compiler->compile(parent::getContent());
   }

src/Dispatch.php

@@ -241,6 +241,8 @@ public function getResponseForPath($path, Request $request)
     if($asset instanceof IDispatchableAsset)
     {
       //Set the asset manager
+
+      $asset->setWorkingDirectory(realpath($directory));
       $asset->setAssetManager(AssetManager::buildFromUri($path));
     }
 

tests/DispatchTest.php

@@ -284,6 +284,16 @@ public function urlProvider()
       . 'test(mStyle.background);}'
     ];
 
+    /**
+     * Scss import paths should work correctly when accessed through dispatch
+     */
+    $tests[] = [
+      array_merge($baseConfig, []),
+      'res/p/domain/b/filehash/test-import.scss',
+      'www.packaged.in',
+      file_get_contents(__DIR__ . '/asset/test-import.expect.css')
+    ];
+
     return $tests;
   }
 

tests/ScssImportTest.php

@@ -12,7 +12,6 @@ public function testScssImports()
     $am->setRelativePath(__DIR__ . '/asset3/');
     $asset->setAssetManager($am);
     $asset->setContent(file_get_contents(__DIR__ . '/asset3/' . 'test.scss'));
-    $asset->setContent(file_get_contents(__DIR__ . '/asset3/' . 'test.scss'));
 
     $this->assertEquals($expect, $asset->getContent());
   }

tests/asset/includes/base.scss

@@ -0,0 +1,6 @@
+@import 'constants';
+
+body {
+  background-color: $color-blue;
+  color: $color-red;
+}

tests/asset/includes/constants.scss

@@ -0,0 +1,2 @@
+$color-red: #c00;
+$color-blue: #00c;

tests/asset/test-import.expect.css

@@ -0,0 +1,9 @@
+body {
+  background-color: #00c;
+  color: #c00; }
+
+div.blue {
+  background-color: #00c; }
+
+div.red {
+  background-color: #c00; }

tests/asset/test-import.scss

@@ -0,0 +1,9 @@
+@import 'includes/base';
+
+div.blue {
+  background-color: $color-blue;
+}
+
+div.red {
+  background-color: $color-red;
+}