Merge pull request #14 from saydum/master

Author: lee-to

src/Casts/UrlCast.php

@@ -15,6 +15,11 @@ public function get($model, string $key, $value, array $attributes)
 
     public function set($model, string $key, $value, array $attributes)
     {
-        return parse_url((string)$value, PHP_URL_PATH) ?? '/';
+        $parsedUrl = parse_url((string)$value);
+
+        $path = isset($parsedUrl['path']) ? '/' . ltrim($parsedUrl['path'], '/') : '/';
+        $query = isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : '';
+
+        return $path . $query;
     }
 }

src/Rules/UrlRule.php

@@ -10,7 +10,7 @@ class UrlRule implements InvokableRule
 {
     public function __invoke($attribute, $value, $fail)
     {
-        if (! is_string(parse_url($value, PHP_URL_PATH))) {
+        if (! is_string($value) || !preg_match('/^\/[^\s]*$/', $value)) {
             $fail('The :attribute must be a valid url path.');
         }
     }

src/SeoManager.php

@@ -42,14 +42,26 @@ private function custom(): array
 
     public function url(string $url = null): Stringable
     {
-        return str($url ?? request()->path())
+        return str($url ?? request()->getRequestUri())
             ->trim('/')
             ->prepend('/');
     }
 
     public function getCacheKey(string $url = null): string
     {
-        return (string) $this->url($url)->slug();
+        $url = (string) $this->url($url);
+        $parsedUrl = parse_url($url);
+        $path = $parsedUrl["path"] ?? '/';
+        $query = isset($parsedUrl["query"]) ? $this->normalizeQuery($parsedUrl["query"]) : '';
+
+       return md5($path . '?' . $query);
+    }
+
+    protected function normalizeQuery(string $query): string
+    {
+        parse_str($query, $params);
+        ksort($params);
+        return http_build_query($params);
     }
 
     public function meta(): SeoMeta
@@ -85,13 +97,22 @@ public function flushCache(string $key = null): void
 
     public function byUrl(): Model|Seo|null
     {
-        if(isset($this->persisted[(string) $this->url()])) {
-            return $this->persisted[(string) $this->url()];
+        $url = (string)$this->url();
+
+        $seo = Seo::query()->where("url", $url)->first();
+
+        if ($seo) {
+            return $seo;
+        }
+
+        $baseUrl = parse_url($url, PHP_URL_PATH);
+        $seo = Seo::query()->where("url", $baseUrl)->first();
+
+        if ($seo) {
+            return $seo;
         }
 
-        return Seo::query()
-            ->where('url', (string) $this->url())
-            ->first();
+        return null;
     }
 
     public function __toString(): string

tests/SeoFeaturesTest.php

@@ -40,6 +40,33 @@ public function it_basic_usage(): void
         $this->assertEquals('Description', seo()->meta()->description());
     }
 
+    /**
+     * @test
+     * @return void
+     */
+    public function it_basic_usage_with_params(): void
+    {
+        $this->app->instance('request', Request::create('/test?page=2'));
+
+        $seo = SeoModel::query()->create([
+            'url' => '/test?page=2',
+            'title' => 'Title',
+            'description' => 'Description params',
+        ]);
+
+        $this->assertEquals($seo->title, seo()->meta()->title());
+
+        $seo->update([
+            'title' => 'New title params',
+        ]);
+
+        $this->assertEquals($seo->title, seo()->meta()->title());
+
+        seo()->title('Custom title params');
+
+        $this->assertEquals('Custom title params', seo()->meta()->title());
+        $this->assertEquals('Description params', seo()->meta()->description());
+    }
 
     /**
      * @test