Merge pull request #37 from tattersoftware/filter-args

MGatner · web-flow · commit 1bd134827080 · 2021-12-02T19:09:05.000-05:00
Filter Arguments
diff --git a/README.md b/README.md
@@ -174,6 +174,13 @@ class Assets extends AssetsConfig
 }
 ```
 
+If you apply the filter via your Routes config file you may also supply bundle class names
+as arguments to merge them with any other configured route bundles:
+```php
+// **app/Config/Routes.php**
+$routes->add('files', 'Files::index', ['filter' => 'assets:\App\Filters\FilesFilter']);
+```
+
 ## Example
 
 You want to make a simple web app for browsing and uploading files, based on Bootstrap's
diff --git a/src/Filters/AssetsFilter.php b/src/Filters/AssetsFilter.php
@@ -6,6 +6,7 @@
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use Tatter\Assets\Bundle;
 use Tatter\Assets\RouteBundle;
 
 /**
@@ -28,7 +29,7 @@ public function before(RequestInterface $request, $arguments = null)
     /**
      * Gathers the route-specific assets and adds their tags to the response.
      *
-     * @param array|null $arguments
+     * @param class-string<Bundle>[]|null $arguments Additional Bundle classes
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null): ?ResponseInterface
     {
@@ -47,7 +48,15 @@ public function after(RequestInterface $request, ResponseInterface $response, $a
             return null;
         }
 
-        $bundle   = RouteBundle::createFromRoute(ltrim($request->getPath(), '/ '));
+        $bundle = RouteBundle::createFromRoute(ltrim($request->getPath(), '/ '));
+
+        // Check for additional Bundles specified in the arguments
+        if (! empty($arguments)) {
+            foreach ($arguments as $class) {
+                $bundle->merge(new $class());
+            }
+        }
+
         $headTags = $bundle->head();
         $bodyTags = $bundle->body();
 
diff --git a/tests/FilterTest.php b/tests/FilterTest.php
@@ -73,6 +73,33 @@ public function testFilter()
         $this->assertSame($expected, $result->getBody());
     }
 
+    public function testFilterWithArguments()
+    {
+        $expected = <<<'EOD'
+            <html>
+            <head>
+            	<title>Test</title>
+            <link href="http://example.com/assets/apple.css" rel="stylesheet" type="text/css" />
+            <link href="https://water.com/glassof.css" rel="stylesheet" type="text/css" />
+            </head>
+            <body>
+            	<h1>Hello</h1>
+            <script src="https://pagecdn.io/lib/cleave/1.6.0/cleave.min.js" type="text/javascript"></script>
+            <script src="http://example.com/assets/banana.js" type="text/javascript"></script>
+            <script src="http://example.com/assets/directory/machines.js" type="text/javascript"></script>
+            </body>
+            </html>
+            EOD;
+
+        $this->request->setPath('foobar');
+
+        $caller = $this->getFilterCaller(AssetsFilter::class, 'after');
+        $result = $caller([LunchBreak::class]);
+
+        $this->assertInstanceOf(ResponseInterface::class, $result);
+        $this->assertSame($expected, $result->getBody());
+    }
+
     public function testEmptyTags()
     {
         $this->config->routes = [];
