Add method for parse path on directives (#30)

* Change the method of parse path on directives * Resolve issues with StyleCI * Resolve issue in StyleCI * Resolve issue StyleCI * Changes to keep the code consistent and cleaner * Update src/SriServiceProvider.php Co-Authored-By: Dieter Sting <[email protected]>
Elhebert · Sep 20, 2019 · 6a31fab · 6a31fab
1 parent f1d0c22
commit 6a31fab
Showing 1 changed file with 37 additions and 18 deletions.
diff --git a/src/SriServiceProvider.php b/src/SriServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Elhebert\SubresourceIntegrity;
 
 use Illuminate\Support\Str;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 
@@ -29,39 +30,57 @@ public function boot()
         ]);
 
         Blade::directive('mixSri', function (string $path, bool $crossOrigin = false) {
+            $path = $this->removeQuotes($path);
+
             if (Str::startsWith($path, ['http', 'https', '//'])) {
                 $href = $path;
             } else {
                 $href = mix($path);
             }
 
-            $integrity = SriFacade::html($path, $crossOrigin);
-
-            if (Str::endsWith($path, 'css')) {
-                return "<link href='{$href}' rel='stylesheet' {$integrity}>";
-            } elseif (Str::endsWith($path, 'js')) {
-                return "<script src='{$href}' {$integrity}></script>";
-            } else {
-                throw new \Exception('Invalid file');
-            }
+            return $this->parseAndGenerateUrl($path, $href, $crossOrigin);
         });
 
         Blade::directive('assetSri', function (string $path, bool $crossOrigin = false) {
+            $path = $this->removeQuotes($path);
+
             if (Str::startsWith($path, ['http', 'https', '//'])) {
                 $href = $path;
             } else {
                 $href = asset($path);
             }
 
-            $integrity = SriFacade::html($path, $crossOrigin);
-
-            if (Str::endsWith($path, 'css')) {
-                return "<link href='{$href}' rel='stylesheet' {$integrity}>";
-            } elseif (Str::endsWith($path, 'js')) {
-                return "<script src='{$href}' {$integrity}></script>";
-            } else {
-                throw new \Exception('Invalid file');
-            }
+            return $this->parseAndGenerateUrl($path, $href, $crossOrigin);
         });
     }
+
+    private function removeQuotes(string $path): string
+    {
+        $values = ['\'', '"'];
+
+        return str_replace($values, '', $path);
+    }
+
+    private function parseAndGenerateUrl(string $path, string $href, bool $crossOrigin): HtmlString
+    {
+        $integrity = SriFacade::html($href, $crossOrigin);
+
+        if (Str::endsWith($path, 'css')) {
+            return $this->generateCssUrl($href, $integrity);
+        } elseif (Str::endsWith($path, 'js')) {
+            return $this->generateJsUrl($href, $integrity);
+        } else {
+            throw new \Exception('Invalid file');
+        }
+    }
+
+    private function generateJsUrl(string $href, string $integrity): HtmlString
+    {
+        return new HtmlString("<script src='{$href}' {$integrity}></script>");
+    }
+
+    private function generateCssUrl(string $href, string $integrity): HtmlString
+    {
+        return new HtmlString("<link href='{$href}' rel='stylesheet' {$integrity}>");
+    }
 }