Bug fixes and cleanup

Author: rtconner

src/Model/Tag.php

@@ -1,8 +1,7 @@
 <?php namespace Conner\Tagging\Model;
 
-use Conner\Tagging\Util;
-use Illuminate\Database\Eloquent\Model as Eloquent;
 use Conner\Tagging\Contracts\TaggingUtility;
+use Illuminate\Database\Eloquent\Model as Eloquent;
 
 /**
  * Copyright (C) 2014 Robert Conner
@@ -62,8 +61,8 @@ public function scopeSuggested($query)
 	}
 
 	/**
-	 * Set the name of the tag : $tag->name = 'myname'; 
-	 * 
+	 * Set the name of the tag : $tag->name = 'myname';
+	 *
 	 * @param string $value
 	 */
 	public function setNameAttribute($value)
@@ -77,7 +76,7 @@ public function setNameAttribute($value)
 	/**
 	 * Look at the tags table and delete any tags that are no londer in use by any taggable database rows.
 	 * Does not delete tags where 'suggest'value is true
-	 * 
+	 *
 	 * @return int
 	 */
 	public static function deleteUnused()

src/Model/Tagged.php

@@ -1,5 +1,6 @@
 <?php namespace Conner\Tagging\Model;
 
+use Conner\Tagging\Contracts\TaggingUtility;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
 /**
@@ -11,6 +12,15 @@ class Tagged extends Eloquent
 	public $timestamps = false;
 	protected $fillable = ['tag_name', 'tag_slug'];
 
+	public function __construct(array $attributes = array())
+	{
+		parent::__construct($attributes);
+		
+		if(function_exists('app')) {
+			$this->taggingUtility = app(TaggingUtility::class);
+		}
+	}
+	
 	/**
 	 * Morph to the tag
 	 *
@@ -28,7 +38,7 @@ public function taggable()
 	 */
 	public function tag()
 	{
-		$model = Util::tagModelString();
+		$model = $this->taggingUtility->tagModelString();
 		return $this->belongsTo($model, 'tag_slug', 'slug');
 	}