Refactor(model traits): rename methods

src/Traits/Bookmark/Markable/Actions.php

@@ -7,33 +7,26 @@
 
 trait Actions
 {
-    protected function markBookmark(Model $marker, bool $value, array | null | NotPassed $metaData = new NotPassed)
+    public function unbookmarkBy(Model $marker)
+    {
+        return $this->bookmarks()
+            ->whereBelongsTo($marker, 'marker')
+            ->first()
+            ?->delete();
+    }
+
+    public function bookmarkBy(Model $marker, array | null | NotPassed $metadata = new NotPassed): Model
     {
         $attributes = [
             'marker_id' => $marker->getKey(),
         ];
 
-        $values = [
-            'value' => $value,
-        ];
+        $values = [];
 
-        if (! $metaData instanceof NotPassed) {
-            $values['metadata'] = $metaData;
+        if (! $metadata instanceof NotPassed) {
+            $values['metadata'] = $metadata;
         }
 
         return $this->bookmarks()->updateOrCreate($attributes, $values);
     }
-
-    public function unmarkBookmark(Model $marker)
-    {
-        return $this->bookmarks()
-            ->whereBelongsTo($marker, 'marker')
-            ->first()
-            ?->delete();
-    }
-
-    public function bookmarkBy(Model $marker, $metadata = null): array
-    {
-        return $this->markBookmark($marker, true, $metadata);
-    }
 }

src/Traits/Bookmark/Markable/Relations.php

@@ -3,12 +3,11 @@
 namespace LaraZeus\Mark\Traits\Bookmark\Markable;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
 use LaraZeus\Mark\Facades\Mark;
 
 trait Relations
 {
-    public function bookmarkedBy()
+    public function bookmarkers()
     {
         return $this->morphToMany(
             related: Mark::getMarkerModel(),
@@ -26,9 +25,4 @@ public function bookmarks(): MorphMany
     {
         return $this->morphMany(Mark::getBookmarkMorphPivotModel(), 'markable');
     }
-
-    public function bookmark(): MorphOne
-    {
-        return $this->morphOne(Mark::getBookmarkMorphPivotModel(), 'markable');
-    }
 }

src/Traits/Bookmark/Markable/Scopes.php

@@ -8,7 +8,7 @@
 
 trait Scopes
 {
-    public function scopeWhereBookmarkedBy(Builder $query, Model | Collection $marker): Builder
+    public function scopeBookmarkedBy(Builder $query, Model | Collection $marker): Builder
     {
         return $query->whereRelation(
             'bookmarks',

src/Traits/Bookmark/Marker/Actions.php

@@ -7,34 +7,27 @@
 
 trait Actions
 {
-    public function markBookmark(Model $markable, bool $value, array | null | NotPassed $metaData = new NotPassed)
+    public function unbookmark(Model $markable)
+    {
+        return $this->bookmarks()
+            ->whereMorphedTo('markable', $markable)
+            ->first()
+            ?->delete();
+    }
+
+    public function bookmark(Model $markable, array | null | NotPassed $metadata = new NotPassed): Model
     {
         $attributes = [
             'markable_type' => $markable->getMorphClass(),
             'markable_id' => $markable->getKey(),
         ];
 
-        $values = [
-            'value' => $value,
-        ];
+        $values = [];
 
-        if (! $metaData instanceof NotPassed) {
-            $values['metadata'] = $metaData;
+        if (! $metadata instanceof NotPassed) {
+            $values['metadata'] = $metadata;
         }
 
         return $this->bookmarks()->updateOrCreate($attributes, $values);
     }
-
-    public function unmarkBookmark(Model $markable)
-    {
-        return $this->bookmarks()
-            ->whereMorphedTo('markable', $markable)
-            ->first()
-            ?->delete();
-    }
-
-    public function bookmark(Model $markable, array | null | NotPassed $metaData = new NotPassed)
-    {
-        return $this->markBookmark($markable, true, $metaData);
-    }
 }

src/Traits/Bookmark/Marker/Scopes.php

@@ -8,7 +8,7 @@
 
 trait Scopes
 {
-    public function scopeWhereBookmarked(Builder $query, Model | Collection $markable): Builder
+    public function scopeBookmarked(Builder $query, Model | Collection $markable): Builder
     {
         return $query->whereRelation(
             'bookmarks',

src/Traits/Like/Markable/Actions.php

@@ -7,7 +7,7 @@
 
 trait Actions
 {
-    protected function markLike(Model $marker, bool $value, array | null | NotPassed $metaData = new NotPassed)
+    protected function markLike(Model $marker, bool $value, array | null | NotPassed $metadata = new NotPassed): Model
     {
         $attributes = [
             'marker_id' => $marker->getKey(),
@@ -17,27 +17,27 @@ protected function markLike(Model $marker, bool $value, array | null | NotPassed
             'value' => $value,
         ];
 
-        if (! $metaData instanceof NotPassed) {
-            $values['metadata'] = $metaData;
+        if (! $metadata instanceof NotPassed) {
+            $values['metadata'] = $metadata;
         }
 
         return $this->likes()->updateOrCreate($attributes, $values);
     }
 
-    public function unmarkLike(Model $marker)
+    public function unlikeBy(Model $marker)
     {
         return $this->likes()
             ->whereBelongsTo($marker, 'marker')
             ->first()
             ?->delete();
     }
 
-    public function likeBy(Model $marker, $metadata = null): array
+    public function likeBy(Model $marker, $metadata = null): Model
     {
         return $this->markLike($marker, true, $metadata);
     }
 
-    public function dislikeBy(Model $marker, $metadata = null): array
+    public function dislikeBy(Model $marker, $metadata = null): Model
     {
         return $this->markLike($marker, false, $metadata);
     }

src/Traits/Like/Markable/Relations.php

@@ -3,12 +3,11 @@
 namespace LaraZeus\Mark\Traits\Like\Markable;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
 use LaraZeus\Mark\Facades\Mark;
 
 trait Relations
 {
-    public function likedBy()
+    public function likers()
     {
         return $this->morphToMany(
             related: Mark::getMarkerModel(),
@@ -25,9 +24,4 @@ public function likes(): MorphMany
     {
         return $this->morphMany(Mark::getLikeMorphPivotModel(), 'markable');
     }
-
-    public function like(): MorphOne
-    {
-        return $this->morphOne(Mark::getLikeMorphPivotModel(), 'markable');
-    }
 }

src/Traits/Like/Markable/Scopes.php

@@ -8,15 +8,15 @@
 
 trait Scopes
 {
-    public function scopeWhereLikedOrDislikedBy(Builder $query, Model | Collection $marker): Builder
+    public function scopeLikedOrDislikedBy(Builder $query, Model | Collection $marker): Builder
     {
         return $query->whereRelation(
             'likes',
             fn (Builder $q) => $q->whereBelongsTo($marker, 'marker')
         );
     }
 
-    public function scopeWhereLikedBy(Builder $query, Model | Collection $marker): Builder
+    public function scopeLikedBy(Builder $query, Model | Collection $marker): Builder
     {
         return $query->whereRelation(
             'likes',
@@ -26,7 +26,7 @@ public function scopeWhereLikedBy(Builder $query, Model | Collection $marker): B
         );
     }
 
-    public function scopeWhereDislikedBy(Builder $query, Model | Collection $marker): Builder
+    public function scopeDislikedBy(Builder $query, Model | Collection $marker): Builder
     {
         return $query->whereRelation(
             'likes',

src/Traits/Like/Marker/Actions.php

@@ -7,7 +7,7 @@
 
 trait Actions
 {
-    public function markLike(Model $markable, bool $value, array | null | NotPassed $metaData = new NotPassed)
+    protected function markLike(Model $markable, bool $value, array | null | NotPassed $metadata = new NotPassed): Model
     {
         $attributes = [
             'markable_type' => $markable->getMorphClass(),
@@ -18,27 +18,27 @@ public function markLike(Model $markable, bool $value, array | null | NotPassed
             'value' => $value,
         ];
 
-        if (! $metaData instanceof NotPassed) {
-            $values['metadata'] = $metaData;
+        if (! $metadata instanceof NotPassed) {
+            $values['metadata'] = $metadata;
         }
 
         return $this->likes()->updateOrCreate($attributes, $values);
     }
 
-    public function unmarkLike(Model $markable)
+    public function unlike(Model $markable)
     {
         return $this->likes()
             ->whereMorphedTo('markable', $markable)
             ->first()
             ?->delete();
     }
 
-    public function like(Model $markable, array | null | NotPassed $metaData = new NotPassed)
+    public function like(Model $markable, array | null | NotPassed $metaData = new NotPassed): Model
     {
         return $this->markLike($markable, true, $metaData);
     }
 
-    public function dislike(Model $markable, array | null | NotPassed $metaData = new NotPassed)
+    public function dislike(Model $markable, array | null | NotPassed $metaData = new NotPassed): Model
     {
         return $this->markLike($markable, false, $metaData);
     }

src/Traits/Like/Marker/Scopes.php

@@ -8,15 +8,15 @@
 
 trait Scopes
 {
-    public function scopeWhereLikedOrDisliked(Builder $query, Model | Collection $markable): Builder
+    public function scopeLikedOrDisliked(Builder $query, Model | Collection $markable): Builder
     {
         return $query->whereRelation(
             'likes',
             fn (Builder $q) => $q->whereMorphedTo('markable', $markable)
         );
     }
 
-    public function scopeWhereLiked(Builder $query, Model | Collection $markable): Builder
+    public function scopeLiked(Builder $query, Model | Collection $markable): Builder
     {
         return $query->whereRelation(
             'likes',
@@ -26,7 +26,7 @@ public function scopeWhereLiked(Builder $query, Model | Collection $markable): B
         );
     }
 
-    public function scopeWhereDisliked(Builder $query, Model | Collection $markable): Builder
+    public function scopeDisliked(Builder $query, Model | Collection $markable): Builder
     {
         return $query->whereRelation(
             'likes',

src/Traits/Rating/Markable/Actions.php

@@ -7,7 +7,15 @@
 
 trait Actions
 {
-    protected function markRating(Model $marker, int $value, array | null | NotPassed $metaData = new NotPassed)
+    public function unrateBy(Model $marker)
+    {
+        return $this->ratings()
+            ->whereBelongsTo($marker, 'marker')
+            ->first()
+            ?->delete();
+    }
+
+    public function rateBy(Model $marker, int $value, array | null | NotPassed $metadata = new NotPassed): Model
     {
         $attributes = [
             'marker_id' => $marker->getKey(),
@@ -17,23 +25,10 @@ protected function markRating(Model $marker, int $value, array | null | NotPasse
             'value' => $value,
         ];
 
-        if (! $metaData instanceof NotPassed) {
-            $values['metadata'] = $metaData;
+        if (! $metadata instanceof NotPassed) {
+            $values['metadata'] = $metadata;
         }
 
         return $this->ratings()->updateOrCreate($attributes, $values);
     }
-
-    public function unmarkRating(Model $marker)
-    {
-        return $this->ratings()
-            ->whereBelongsTo($marker, 'marker')
-            ->first()
-            ?->delete();
-    }
-
-    public function rateBy(Model $marker, int $value, $metadata = null): array
-    {
-        return $this->markRating($marker, $value, $metadata);
-    }
 }

src/Traits/Rating/Markable/Relations.php

@@ -3,12 +3,11 @@
 namespace LaraZeus\Mark\Traits\Rating\Markable;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
 use LaraZeus\Mark\Facades\Mark;
 
 trait Relations
 {
-    public function ratedBy()
+    public function raters()
     {
         return $this->morphToMany(
             related: Mark::getMarkerModel(),
@@ -25,9 +24,4 @@ public function ratings(): MorphMany
     {
         return $this->morphMany(Mark::getRatingMorphPivotModel(), 'markable');
     }
-
-    public function rating(): MorphOne
-    {
-        return $this->morphOne(Mark::getRatingMorphPivotModel(), 'markable');
-    }
 }

src/Traits/Rating/Markable/Scopes.php

@@ -8,7 +8,7 @@
 
 trait Scopes
 {
-    public function scopeWhereRatedBy(Builder $query, Model | Collection $marker): Builder
+    public function scopeRatedBy(Builder $query, Model | Collection $marker): Builder
     {
         return $query->whereRelation(
             'ratings',