Merge pull request #4 from CodeIncHQ/1.x

v1.1.1

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "codeinc/assets-middleware",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A PSR-15 middleware to server static assets (CSS, JS, images, etc.)",
   "homepage": "https://github.com/CodeIncHQ/AssetsMiddleware",
   "type": "library",

src/Assets/AssetMinifiedResponse.php

@@ -25,6 +25,8 @@
 use CodeInc\Psr7Responses\StreamResponse;
 use function GuzzleHttp\Psr7\stream_for;
 use MatthiasMullie\Minify;
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
 
 
 /**
@@ -69,22 +71,8 @@ public function __construct(string $filePath, string $assetName, ?string $fileNa
             $mimeType = MediaTypes::getFilenameMediaType($fileName);
         }
 
-        switch ($mimeType) {
-            case 'text/css':
-                $stream = stream_for((new Minify\CSS($filePath))->minify());
-                break;
-
-            case 'text/javascript':
-                $stream = stream_for((new Minify\JS($filePath))->minify());
-                break;
-
-            default:
-                $stream = stream_for($filePath);
-                break;
-        }
-
         parent::__construct(
-            $stream,
+            $this->getStream($mimeType, $filePath),
             $mimeType,
             null,
             $fileName,
@@ -96,6 +84,32 @@ public function __construct(string $filePath, string $assetName, ?string $fileNa
         );
     }
 
+    /**
+     * @param string $mimeType
+     * @param string $filePath
+     * @return StreamInterface
+     */
+    private function getStream(string $mimeType, string $filePath):StreamInterface
+    {
+        switch ($mimeType) {
+            case 'text/css':
+                return stream_for((new Minify\CSS($filePath))->minify());
+
+            case 'text/javascript':
+                return stream_for((new Minify\JS($filePath))->minify());
+
+            default:
+                $f = fopen($filePath, 'r');
+                if ($f === false) {
+                    throw new RuntimeException(
+                        sprintf("Unable to open the assets file '%s'",
+                            $filePath)
+                    );
+                }
+                return stream_for($f);
+        }
+    }
+
     /**
      * @inheritdoc
      * @return string

src/AssetsMiddlewareException.php

@@ -21,6 +21,7 @@
 //
 declare(strict_types=1);
 namespace CodeInc\AssetsMiddleware;
+use RuntimeException;
 use Throwable;
 
 
@@ -29,10 +30,8 @@
  *
  * @package CodeInc\AssetsMiddleware
  * @author Joan Fabrégat <[email protected]>
- * @license MIT <https://github.com/CodeIncHQ/AssetsMiddleware/blob/master/LICENSE>
- * @link https://github.com/CodeIncHQ/AssetsMiddleware
  */
-class AssetsMiddlewareException extends \Exception
+class AssetsMiddlewareException extends RuntimeException
 {
     /**
      * @var AssetsMiddleware