Fixes #196

Author: rtconner

docs/tag-groups.md

@@ -7,7 +7,14 @@ TagGroups are a simple feature that let you group a set of tags together
 php artisan tagging:create-group MyTagGroup
 ```
 
-Set the tag group for a tag
+Assign a group when tagging a model
+
+```php
+$article->tag('Gardening', group: 'MyTagGroup');
+$article->tag(['Gardening', 'Floral'], group: 'MyTagGroup');
+```
+
+Or set the tag group directly on a tag
 
 ```php
 $tag->setGroup('MyTagGroup');

docs/usage-examples.md

@@ -15,6 +15,8 @@ foreach($article->tags as $tag) {
 $article->tag('Gardening'); // attach the tag
 $article->tag('Gardening, Floral'); // attach the tag
 $article->tag(['Gardening', 'Floral']); // attach the tag
+$article->tag('Gardening', group: 'MyTagGroup'); // attach the tag and assign to a group
+$article->tag('Gardening', locale: 'fr'); // attach the tag with a locale
 
 $article->untag('Cooking'); // remove Cooking tag
 $article->untag(); // remove all tags

src/Contracts/TaggableContract.php

@@ -14,7 +14,7 @@ interface TaggableContract
      *
      * @param  string|array  $tagNames
      */
-    public function addTags($tagNames, $locale = null);
+    public function addTags($tagNames, $locale = null, $group = null);
 
     /**
      * Return array of the tag names related to the current model

src/Taggable.php

@@ -97,12 +97,12 @@ public function getTagNamesAttribute(): array
      * @param  string|array  $tagNames
      * @return void
      */
-    public function addTags($tagNames, $locale = null)
+    public function addTags($tagNames, $locale = null, $group = null)
     {
         $tagNames = TaggingUtility::makeTagArray($tagNames);
 
         foreach ($tagNames as $tagName) {
-            $this->addSingleTag($tagName, $locale);
+            $this->addSingleTag($tagName, $locale, $group);
         }
     }
 
@@ -112,9 +112,9 @@ public function addTags($tagNames, $locale = null)
      * @param  string|array  $tagNames
      * @return void
      */
-    public function tag($tagNames, $locale = null)
+    public function tag($tagNames, $locale = null, $group = null)
     {
-        $this->addTags($tagNames, $locale);
+        $this->addTags($tagNames, $locale, $group);
     }
 
     /**
@@ -242,7 +242,7 @@ public function scopeWithoutTags(Builder $query, $tagNames): Builder
      *
      * @param  string  $tagName
      */
-    private function addSingleTag($tagName, $locale = null)
+    private function addSingleTag($tagName, $locale = null, $group = null)
     {
         $tagName = trim($tagName);
 
@@ -266,7 +266,7 @@ private function addSingleTag($tagName, $locale = null)
 
         $this->tagged()->save($tagged);
 
-        TaggingUtility::incrementCount($tagName, $tagSlug, 1, $locale);
+        TaggingUtility::incrementCount($tagName, $tagSlug, 1, $locale, $group);
 
         unset($this->relations['tagged']);
 

src/TaggingUtility.php

@@ -200,7 +200,7 @@ public static function slug($str)
      * @param  string  $tagSlug
      * @param  int  $count
      */
-    public static function incrementCount($tagString, $tagSlug, $count, $locale = null)
+    public static function incrementCount($tagString, $tagSlug, $count, $locale = null, $group = null)
     {
         if ($count <= 0) {
             return;
@@ -225,6 +225,10 @@ public static function incrementCount($tagString, $tagSlug, $count, $locale = nu
 
         $tag->count = $tag->count + $count;
         $tag->save();
+
+        if ($group) {
+            $tag->setGroup($group);
+        }
     }
 
     /**