Use assetc picker service

Author: SongoQ

AssetsBundle/Resources/config/services.yml

@@ -5,13 +5,14 @@ parameters:
 
 services:
     docplanner_assets_bundle.twig.assets:
-        class:     %docplanner_assets_bundle.twig.assets.class%
+        class: %docplanner_assets_bundle.twig.assets.class%
         arguments: [ @docplanner_assets_bundle.service.assets_loader ]
         tags:
             - { name: twig.extension }
 
     docplanner_assets_bundle.service.assets_loader:
-        class:    %docplanner_assets_bundle.service.assets_loader.class%
+        class: %docplanner_assets_bundle.service.assets_loader.class%
+        arguments: [ @docplanner_assets.service.assets_picker ]
 
     docplanner_assets.service.assets_picker:
         class: %docplanner_assets.service.assets_picker.class% 

AssetsBundle/Service/AssetsLoader.php

@@ -2,73 +2,93 @@
 
 namespace Docplanner\AssetsBundle\Service;
 
+use Docplanner\AssetsBundle\IO\Asset;
+
 class AssetsLoader
 {
+
+	/** @var AssetsPicker $assetsPicker */
+	private $asstsPicker;
+
+	/**
+	 * @param AssetsPicker $assetsPicker
+	 */
+	public function __construct(AssetsPicker $assetsPicker)
+	{
+		$this->asstsPicker = $assetsPicker;
+	}
+
 	/**
 	 * @param null $type
 	 *
 	 * @return string
 	 */
-	public function renderScript($type = 'file')
+	public function renderScript($type = 'src')
 	{
-		$files = ['platform/js/rwd-common.js'];
+		$assets = $this->asstsPicker->pickScriptAssets();
+		$mask  = $type == 'inline' ? '<script>%s</script>' : '<script src="%s?%s"></script>';
 
-		$mask = $type == 'inline' ? '<script>%s</script>' : '<script src="%s?%s"></script>';
-
-		return $this->render($mask, $files, $type);
+		return $this->render($mask, $assets, $type);
 	}
 
 	/**
 	 * @param null $type
 	 *
 	 * @return string
 	 */
-	public function renderStyle($type = 'file')
+	public function renderStyle($type = 'src')
 	{
-		$files = ['platform/css/rwd-common.css'];
-
-		$mask = $type == 'inline' ? '<style>%s</style>' : '<link rel="stylesheet" type="text/css" href="%s?%s">';
+		$assets = $this->asstsPicker->pickStyleAssets();
+		$mask  = $type == 'inline' ? '<style>%s</style>' : '<link rel="stylesheet" type="text/css" href="%s?%s">';
 
-		return $this->render($mask, $files, $type);
+		return $this->render($mask, $assets, $type);
 	}
 
 	/**
-	 * @param $mask
-	 * @param $files
-	 * @param $type
+	 * @param         $mask
+	 * @param Asset[] $assets
+	 * @param         $type
 	 *
 	 * @return string
 	 */
-	private function render($mask, $files, $type)
+	private function render($mask, $assets, $type)
 	{
 		$ret = '';
 
-		if ($type == 'file')
+		if ($type == 'src')
 		{
-			foreach ($files as $file)
+			foreach ($assets as $asset)
 			{
-				if (!file_exists($file))
+				if (!file_exists($asset->getSrc()))
 				{
-					throw new \LogicException(sprintf('File %s not found', $file));
+					throw new \LogicException(sprintf('File %s not found', $asset->getSrc()));
 				}
 
-				$ret .= sprintf($mask, $file, crc32(file_get_contents($file)));
+				if ($asset->getSrc())
+				{
+					$ret .= sprintf($mask, $asset->getSrc(), crc32(file_get_contents($asset->getSrc())));
+				}
 			}
 		}
 		else
 		{
-			foreach ($files as $file)
+			foreach ($assets as $asset)
 			{
-				if (!file_exists($file))
+				if (!file_exists($asset->getInline()))
 				{
-					throw new \LogicException(sprintf('File %s not found', $file));
+					throw new \LogicException(sprintf('File %s not found', $asset->getInline()));
 				}
 
-				$source = file_get_contents($file);
-				$ret .= $source;
+				if ($asset->getInline())
+				{
+					$ret .= file_get_contents($asset->getInline());
+				}
 			}
 
-			$ret = sprintf($mask, $ret);
+			if ($ret)
+			{
+				$ret = sprintf($mask, $ret);
+			}
 		}
 
 		return $ret;

AssetsBundle/Twig/AssetsExtension.php

@@ -33,7 +33,7 @@ public function getFunctions()
 	 *
 	 * @return string
 	 */
-	public function assetsScript($type = 'file')
+	public function assetsScript($type = 'src')
 	{
 		return $this->assetsLoader->renderScript($type);
 	}
@@ -43,7 +43,7 @@ public function assetsScript($type = 'file')
 	 *
 	 * @return string
 	 */
-	public function assetsStyle($type = 'file')
+	public function assetsStyle($type = 'src')
 	{
 		return $this->assetsLoader->renderStyle($type);
 	}