Refactor to remove some complexity

Fixes #4

Author: vlados

phpinsights.config.php

@@ -85,14 +85,15 @@
         PropertyTypeHintSniff::class,
         ReturnTypeHintSniff::class,
         UselessFunctionDocCommentSniff::class,
+//        \NunoMaduro\PhpInsights\Domain\Metrics\Complexity\Complexity::class,
     ],
 
     'config' => [
         ForbiddenPrivateMethods::class => [
             'title' => 'The usage of private methods is not idiomatic in Laravel.',
         ],
         \NunoMaduro\PhpInsights\Domain\Insights\CyclomaticComplexityIsHigh::class => [
-            'maxComplexity' => 20,
+            'maxComplexity' => 10,
         ],
 
     ],
@@ -110,7 +111,7 @@
 
     'requirements' => [
         'min-quality' => 80,
-        'min-complexity' => 80,
+        'min-complexity' => 65,
         'min-architecture' => 80,
         'min-style' => 80,
         'disable-security-check' => true,

src/HasUniqueUrlAttributes.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Vlados\LaravelUniqueUrls;
+
+trait HasUniqueUrlAttributes
+{
+    public function initializeHasUniqueUrlTrait(): void
+    {
+        $this->append('relative_url');
+        $this->append('absolute_url');
+        $this->makeVisible('relative_url');
+        $this->makeVisible('absolute_url');
+    }
+
+    public function getRelativeUrlAttribute(): string
+    {
+        return $this->getUrl(false);
+    }
+
+    public function getAbsoluteUrlAttribute(): string
+    {
+        return $this->getUrl(true);
+    }
+
+    /**
+     * Returns the absolute url for the model.
+     *
+     * @return string
+     *
+     * @throws Throwable
+     */
+    private function getUrl($absolute = true): string
+    {
+        $url = $this->url()->where('language', app()->getLocale())->first()->slug ?? '';
+
+        return $absolute ? url($url) : $url;
+    }
+}

src/HasUniqueUrlTrait.php

@@ -3,7 +3,6 @@
 namespace Vlados\LaravelUniqueUrls;
 
 use Exception;
-use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Str;
@@ -64,57 +63,43 @@ public function url(): MorphOne
         return $this->morphOne(Url::class, 'related');
     }
 
-    /**
-     * Returns the absolute url for the model.
-     *
-     * @return string
-     *
-     * @throws Throwable
-     */
-    private function getUrl($absolute = true): string
-    {
-        $url = $this->url()->where('language', app()->getLocale())->first()->slug ?? '';
-
-        return $absolute ? url($url) : $url;
-    }
-
     public function urlStrategy(): string
     {
         return Str::slug($this->getAttribute('name'));
     }
 
-    /**
-     * Generate automatically the urls on create. You can disable it and manually trigger it after.
-     *
-     * @return bool
-     */
     public function isAutoGenerateUrls(): bool
     {
         return $this->autoGenerateUrls;
     }
 
-    /**
-     * @param bool $autoGenerateUrls
-     */
     public function setAutoGenerateUrls(bool $autoGenerateUrls): void
     {
         $this->autoGenerateUrls = $autoGenerateUrls;
     }
 
+    public function getRelativeUrlAttribute(): string
+    {
+        return $this->getUrl(false);
+    }
+
+    public function getAbsoluteUrlAttribute(): string
+    {
+        return $this->getUrl(true);
+    }
+
     protected static function bootHasUniqueUrlTrait(): void
     {
         static::created(function (Model $model) {
-            if ($model->isAutoGenerateUrls() === false) {
-                return;
+            if ($model->isAutoGenerateUrls() === true) {
+                $model->generateUrl();
             }
-            $model->generateUrl();
         });
 
         static::updated(function (Model $model) {
-            if ($model->isAutoGenerateUrls() === false) {
-                return;
+            if ($model->isAutoGenerateUrls() === true) {
+                $model->generateUrlOnUpdate();
             }
-            $model->generateUrlOnUpdate();
         });
     }
 
@@ -123,29 +108,26 @@ protected function generateUrlOnUpdate(): void
         $unique_url = Url::makeSlug($this->urlStrategy(), $this);
         $this->url()->get()->each(function (Url $url) use ($unique_url) {
             $prefix = config('app.fallback_locale') === $url->getAttribute('language') ? '' : $url->getAttribute('language') . '/';
-            if ($url->getAttribute('slug') === $prefix . $unique_url) {
-                return;
+            if ($url->getAttribute('slug') !== $prefix . $unique_url) {
+                $url->update([
+                    'slug' => $prefix . $unique_url,
+                ]);
+                $url->save();
             }
-
-            $url->update([
-                'slug' => $prefix . $unique_url,
-            ]);
-            $url->save();
         });
     }
 
     /**
-     * Interact with the user's address.
+     * Returns the absolute url for the model.
+     *
+     * @return string
      *
-     * @return  Attribute
+     * @throws Throwable
      */
-    public function getRelativeUrlAttribute(): string
+    private function getUrl($absolute = true): string
     {
-        return $this->getUrl(false);
-    }
+        $url = $this->url()->where('language', app()->getLocale())->first()->slug ?? '';
 
-    public function getAbsoluteUrlAttribute(): string
-    {
-        return $this->getUrl(true);
+        return $absolute ? url($url) : $url;
     }
 }

src/LaravelUniqueUrls.php

@@ -22,14 +22,12 @@ public function handleRequest(Url $urlObj, Request $request)
             return \App::call([$slugController, '__invoke']);
         }
         $arguments['related'] = $urlObj->related;
-        if (isset($urlObj->method, $arguments) && method_exists($urlObj->controller, $urlObj->method)) {
-            $called = $slugController->{$urlObj->method}($request, $arguments);
-        } elseif (isset($urlObj->method) && ! isset($arguments) && method_exists($urlObj->controller, $urlObj->method)) {
-            $called = $slugController->{$urlObj->method}($request);
-        } elseif (! isset($urlObj->method) && isset($arguments) && method_exists($urlObj->controller, 'show')) {
-            $called = $slugController->show($arguments);
-        } elseif (! isset($urlObj->method) && ! isset($arguments) && method_exists($urlObj->controller, 'index')) {
-            $called = $slugController->index($request);
+        if (method_exists($urlObj->controller, $urlObj->method)) {
+            $called = $slugController->{$urlObj->method}($request, $arguments ?? []);
+        } elseif (method_exists($urlObj->controller, 'show')) {
+            $called = $slugController->show($request, $arguments ?? []);
+        } elseif (method_exists($urlObj->controller, 'index')) {
+            $called = $slugController->index($request, $arguments ?? []);
         }
         if (isset($called) && $called !== false) {
             return $called;