From aa85b4274ad76e77398e3c73c3c2b0ea5b8a8b1f Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:33:20 -0500 Subject: [PATCH 01/20] support slug taxonomy --- src/Taxonomy.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 1fb741e..279f5ff 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -25,12 +25,12 @@ public function __construct(Vocabulary $vocabulary, Term $term) { * The Vocabulary object if created, FALSE if error creating, * Exception if the vocabulary name already exists. */ - public function createVocabulary($name) { + public function createVocabulary($name,$slug=null) { if ($this->vocabulary->where('name', $name)->count()) { throw new Exceptions\VocabularyExistsException(); } - return $this->vocabulary->create(['name' => $name]); + return $this->vocabulary->create(['name' => $name,'slug' => $slug]); } /** @@ -59,6 +59,18 @@ public function getVocabularyByName($name) { return $this->vocabulary->where('name', $name)->first(); } + /** + * Get a Vocabulary by slug + * + * @param string $slug + * The name of the Vocabulary to fetch + * + * @return + * The Vocabulary Model object, otherwise NULL + */ + public function getVocabularyBySlug($slug) { + return $this->vocabulary->where('slug', $slug)->first(); + } /** * Get a Vocabulary by name * From 1f6c0aa10683775250838ae543ccc4fbdd4260ae Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:36:55 -0500 Subject: [PATCH 02/20] Update Vocabulary.php --- src/Models/Vocabulary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Models/Vocabulary.php b/src/Models/Vocabulary.php index 196e6a6..2273501 100644 --- a/src/Models/Vocabulary.php +++ b/src/Models/Vocabulary.php @@ -3,7 +3,7 @@ class Vocabulary extends \Eloquent { protected $fillable = [ - 'name', + 'name', 'slug', ]; protected $table = 'vocabularies'; From 9c2e747f04fd4b8ef89c6621534344a72e79ff8a Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:37:39 -0500 Subject: [PATCH 03/20] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c97103f..4fc8885 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ } ], "require": { - "php": ">=5.4", - "illuminate/support": "~5.0" + "php": ">=7.0", + "illuminate/support": "~6.0" }, "require-dev": { "mockery/mockery": "0.9.*", From 573b602618e7def01756f1e6b8d27efe783b5867 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:40:17 -0500 Subject: [PATCH 04/20] Update 2014_10_29_164909_create_vocabularies_table.php --- src/migrations/2014_10_29_164909_create_vocabularies_table.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/migrations/2014_10_29_164909_create_vocabularies_table.php b/src/migrations/2014_10_29_164909_create_vocabularies_table.php index d21def8..72096b3 100644 --- a/src/migrations/2014_10_29_164909_create_vocabularies_table.php +++ b/src/migrations/2014_10_29_164909_create_vocabularies_table.php @@ -14,6 +14,7 @@ public function up() Schema::create('vocabularies', function($table) { $table->increments('id'); $table->string('name'); + $table->string('slug'); $table->timestamps(); }); } @@ -28,4 +29,4 @@ public function down() Schema::dropIfExists('vocabularies'); } -} \ No newline at end of file +} From e2d58f8d037c65ebd5a339eb1c3319f43e3b8e04 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:49:17 -0500 Subject: [PATCH 05/20] extended support slugs --- src/Taxonomy.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 279f5ff..3cd20b6 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -29,9 +29,12 @@ public function createVocabulary($name,$slug=null) { if ($this->vocabulary->where('name', $name)->count()) { throw new Exceptions\VocabularyExistsException(); } + if (!is_null($slug)&&$this->vocabulary->where('slug', $slug)->count()) { + throw new Exceptions\VocabularyExistsException(); + } - return $this->vocabulary->create(['name' => $name,'slug' => $slug]); - } + return $this->vocabulary->create(['name' => $name,'slug' => $slug]); + } /** * Get a Vocabulary by ID @@ -119,7 +122,35 @@ public function getVocabularyByNameOptionsArray($name) { return $options; } + /** + * Get a Vocabulary by slug as an options array for dropdowns + * + * @param string $slug + * The name of the Vocabulary to fetch + * + * @return + * The Vocabulary Model object, otherwise NULL + */ + public function getVocabularyBySlugOptionsArray($slug) { + $vocabulary = $this->vocabulary->where('slug', $slug)->first(); + + if (is_null($vocabulary)) { + return []; + } + + $parents = $this->term->whereParent(0) + ->whereVocabularyId($vocabulary->id) + ->orderBy('weight', 'ASC') + ->get(); + + $options = []; + foreach ($parents as $parent) { + $options[$parent->id] = $parent->name; + $this->recurse_children($parent, $options); + } + return $options; + } /** * Recursively visit the children of a term and generate the '- ' option array for dropdowns * @@ -175,6 +206,24 @@ public function deleteVocabularyByName($name) { return FALSE; } + /** + * Delete a Vocabulary by slug + * + * @param string $slug + * The name of the Vocabulary to delete + * + * @return bool + * TRUE if Vocabulary is deletes, otherwise FALSE + */ + public function deleteVocabularyBySlug($slug) { + $vocabulary = $this->vocabulary->where('slug', $slug)->first(); + + if (!is_null($vocabulary)) { + return $vocabulary->delete(); + } + + return FALSE; + } /** * Create a new term in a specific vocabulary * From 50d8832e8ca5ee9374d2a916b60e915efc945321 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:53:01 -0500 Subject: [PATCH 06/20] suport slug added --- src/TaxonomyTrait.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/TaxonomyTrait.php b/src/TaxonomyTrait.php index 05cd07a..69427dc 100644 --- a/src/TaxonomyTrait.php +++ b/src/TaxonomyTrait.php @@ -70,6 +70,21 @@ public function getTermsByVocabularyName($name) { return $this->related()->where('vocabulary_id', $vocabulary->id)->get(); } + /** + * Get all the terms for a given vocabulary that are linked to the current + * Model. + * + * @param $slug string + * The name of the vocabulary + * + * @return object + * A collection of TermRelation objects + */ + public function getTermsByVocabularySlug($slug) { + $vocabulary = \Taxonomy::getVocabularyBySlug($slug); + + return $this->related()->where('vocabulary_id', $vocabulary->id)->get(); + } /** * Get all the terms for a given vocabulary that are linked to the current * Model as a key value pair array. @@ -92,6 +107,30 @@ public function getTermsByVocabularyNameAsArray($name) { return $data; } + + + /** + * Get all the terms for a given vocabulary that are linked to the current + * Model as a key value pair array. + * + * @param $slug string + * The name of the vocabulary + * + * @return array + * A key value pair array of the type 'id' => 'name' + */ + public function getTermsByVocabularyNameAsArray($slug) { + $vocabulary = \Taxonomy::getVocabularyBySlug($slug); + + $term_relations = $this->related()->where('vocabulary_id', $vocabulary->id)->get(); + + $data = []; + foreach ($term_relations as $term_relation) { + $data[$term_relation->term->id] = $term_relation->term->name; + } + + return $data; + } /** * Unlink the given term with the current model object From 52579a78497cedfdf012a54a1f28f29bbd5acc57 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:57:23 -0500 Subject: [PATCH 07/20] support slug added --- src/Controllers/TaxonomyController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controllers/TaxonomyController.php b/src/Controllers/TaxonomyController.php index 27fd3b8..f792016 100644 --- a/src/Controllers/TaxonomyController.php +++ b/src/Controllers/TaxonomyController.php @@ -65,7 +65,7 @@ public function getCreate() { public function postStore(Request $request) { $this->validate($request, isset($this->vocabulary->rules_create) ? $this->vocabulary->rules_create : $this->vocabulary->rules); - Vocabulary::create(Input::only('name')); + Vocabulary::create(Input::only('name','slug')); return Redirect::to(action('\Devfactory\Taxonomy\Controllers\TaxonomyController@getIndex'))->with('success', 'Created'); @@ -97,7 +97,7 @@ public function putUpdate(Request $request, $id) { $this->validate($request, isset($this->vocabulary->rules_create) ? $this->vocabulary->rules_create : $this->vocabulary->rules); $vocabulary = $this->vocabulary->findOrFail($id); - $vocabulary->update(Input::only('name')); + $vocabulary->update(Input::only('name','slug')); return Redirect::to(action('\Devfactory\Taxonomy\Controllers\TaxonomyController@getIndex'))->with('success', 'Updated'); From 7cca383ff7d7b5cfa0023f5b9fdaaa5f090314ae Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 08:59:56 -0500 Subject: [PATCH 08/20] support slug added --- src/views/vocabulary/create.blade.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/vocabulary/create.blade.php b/src/views/vocabulary/create.blade.php index 6dcf59c..e0dcae0 100644 --- a/src/views/vocabulary/create.blade.php +++ b/src/views/vocabulary/create.blade.php @@ -22,7 +22,12 @@ {!! $errors->has('name') ? Form::label('error', $errors->first('name'), array('class' => 'control-label')) : '' !!} {!! $errors->has('name') ? '' : '' !!} - +
+ {!! Form::label('slug', Lang::get('taxonomy::vocabulary.create.label.slug'), ['class' => 'control-label']) !!} + {!! Form::text('slug', NULL, ['class' => 'form-control']) !!} + {!! $errors->has('slug') ? Form::label('error', $errors->first('slug'), array('class' => 'control-label')) : '' !!} + {!! $errors->has('slug') ? '' : '' !!} +
From f19cbd64d8de7746eb459ead46a3bf7716f72de2 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:00:39 -0500 Subject: [PATCH 09/20] support slug added --- src/views/vocabulary/edit.blade.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/vocabulary/edit.blade.php b/src/views/vocabulary/edit.blade.php index 26e0f92..9da67c0 100644 --- a/src/views/vocabulary/edit.blade.php +++ b/src/views/vocabulary/edit.blade.php @@ -22,7 +22,12 @@ {!! $errors->has('name') ? Form::label('error', $errors->first('name'), array('class' => 'control-label')) : '' !!} {!! $errors->has('name') ? '' : '' !!}
- +
+ {!! Form::label('slug', Lang::get('taxonomy::vocabulary.create.label.slug'), ['class' => 'control-label']) !!} + {!! Form::text('slug', NULL, ['class' => 'form-control']) !!} + {!! $errors->has('slug') ? Form::label('error', $errors->first('slug'), array('class' => 'control-label')) : '' !!} + {!! $errors->has('slug') ? '' : '' !!} +
From ccf54fbfdc76070710a5ab614ffd9eb9fd65a63d Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:01:26 -0500 Subject: [PATCH 10/20] support slug added --- src/lang/en/vocabulary.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/en/vocabulary.php b/src/lang/en/vocabulary.php index a948a28..a1afe0a 100644 --- a/src/lang/en/vocabulary.php +++ b/src/lang/en/vocabulary.php @@ -23,6 +23,7 @@ 'header' => 'Create a new Vocabulary', 'label' => array( 'name' => 'Name', + 'slug' => 'Slug', ), 'button' => array( 'create' => 'Create', @@ -39,4 +40,4 @@ ), ), 'vocabularies' => 'Vocabularies', -); \ No newline at end of file +); From fe957657831244d8ee2da311d7daf3522a96ec04 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:04:37 -0500 Subject: [PATCH 11/20] added getVocabularyBySlugAsArray --- src/Taxonomy.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 3cd20b6..35e0a7d 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -93,6 +93,24 @@ public function getVocabularyByNameAsArray($name) { return []; } + /** + * Get a Vocabulary by slug + * + * @param string $slug + * The name of the Vocabulary to fetch + * + * @return + * The Vocabulary Model object, otherwise NULL + */ + public function getVocabularyBySlugAsArray($slug) { + $vocabulary = $this->vocabulary->where('slug', $slug)->first(); + + if (!is_null($vocabulary)) { + return $vocabulary->terms->pluck('name', 'id')->toArray(); + } + + return []; + } /** * Get a Vocabulary by name as an options array for dropdowns * From e45c69aa3c2b2d2053e4e200d63856a2119cfe05 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:10:33 -0500 Subject: [PATCH 12/20] getTermsByVocabularySlugAsArray fixed --- src/TaxonomyTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaxonomyTrait.php b/src/TaxonomyTrait.php index 69427dc..290ed0e 100644 --- a/src/TaxonomyTrait.php +++ b/src/TaxonomyTrait.php @@ -119,7 +119,7 @@ public function getTermsByVocabularyNameAsArray($name) { * @return array * A key value pair array of the type 'id' => 'name' */ - public function getTermsByVocabularyNameAsArray($slug) { + public function getTermsByVocabularySlugAsArray($slug) { $vocabulary = \Taxonomy::getVocabularyBySlug($slug); $term_relations = $this->related()->where('vocabulary_id', $vocabulary->id)->get(); From 26a2fd54fda5911bca3100ff38852f9acdbb0a62 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:36:18 -0500 Subject: [PATCH 13/20] Update Taxonomy.php --- src/Taxonomy.php | 61 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 35e0a7d..7d0c520 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -14,7 +14,45 @@ public function __construct(Vocabulary $vocabulary, Term $term) { $this->vocabulary = $vocabulary; $this->term = $term; } - + /** + * Cleang string of accents mark + * + * @param string $str + * The string to clean up + * + * @return string + * Return the string purified + */ + private function cleanAccentMark($str){ + $str = str_replace( + array('Á', 'À', 'Â', 'Ä', 'á', 'à', 'ä', 'â', 'ª'), + array('A', 'A', 'A', 'A', 'a', 'a', 'a', 'a', 'a'), + $str + ); + $str = str_replace( + array('É', 'È', 'Ê', 'Ë', 'é', 'è', 'ë', 'ê'), + array('E', 'E', 'E', 'E', 'e', 'e', 'e', 'e'), + $str ); + $str = str_replace( + array('Í', 'Ì', 'Ï', 'Î', 'í', 'ì', 'ï', 'î'), + array('I', 'I', 'I', 'I', 'i', 'i', 'i', 'i'), + $str ); + $str = str_replace( + array('Ó', 'Ò', 'Ö', 'Ô', 'ó', 'ò', 'ö', 'ô'), + array('O', 'O', 'O', 'O', 'o', 'o', 'o', 'o'), + $str ); + $str = str_replace( + array('Ú', 'Ù', 'Û', 'Ü', 'ú', 'ù', 'ü', 'û'), + array('U', 'U', 'U', 'U', 'u', 'u', 'u', 'u'), + $str ); + $str = str_replace( + array('Ñ', 'ñ', 'Ç', 'ç'), + array('N', 'n', 'C', 'c'), + $str + ); + + return $str; + } /** * Create a new Vocabulary with the given name * @@ -35,7 +73,26 @@ public function createVocabulary($name,$slug=null) { return $this->vocabulary->create(['name' => $name,'slug' => $slug]); } - + /** + * Auto create slug + * + * @param string $separator + * The separator for blank spaces + * + * @return + * Return TRUE + */ + public function autoCreateSlugs($separator='-') { + $vocabularies = $this->vocabulary->where('slug',null)->get(); + + foreach($vocabularies as $vocabulary){ + $new_name = strtolower($this->cleanAccentMark($vocabulary->name)); + $new_name = str_replace(" ", $separator, $new_name); + $vocabulary->name = $new_name; + $vocabulary->save(); + } + return TRUE; + } /** * Get a Vocabulary by ID * From e811274d6d6d559e96ce99bcbcd24100d007335f Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:42:00 -0500 Subject: [PATCH 14/20] Update Taxonomy.php --- src/Taxonomy.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 7d0c520..4b7c869 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -82,7 +82,9 @@ public function createVocabulary($name,$slug=null) { * @return * Return TRUE */ - public function autoCreateSlugs($separator='-') { + public function autoCreateSlugs($separator=null) { + if(is_null($separator)) + $separator="-"; $vocabularies = $this->vocabulary->where('slug',null)->get(); foreach($vocabularies as $vocabulary){ @@ -91,7 +93,7 @@ public function autoCreateSlugs($separator='-') { $vocabulary->name = $new_name; $vocabulary->save(); } - return TRUE; + return true; } /** * Get a Vocabulary by ID From 5c783d3375358dbedf15da6a605fe795133dc975 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:43:32 -0500 Subject: [PATCH 15/20] Update Taxonomy.php --- src/Taxonomy.php | 62 +----------------------------------------------- 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 4b7c869..3f55f96 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -14,45 +14,7 @@ public function __construct(Vocabulary $vocabulary, Term $term) { $this->vocabulary = $vocabulary; $this->term = $term; } - /** - * Cleang string of accents mark - * - * @param string $str - * The string to clean up - * - * @return string - * Return the string purified - */ - private function cleanAccentMark($str){ - $str = str_replace( - array('Á', 'À', 'Â', 'Ä', 'á', 'à', 'ä', 'â', 'ª'), - array('A', 'A', 'A', 'A', 'a', 'a', 'a', 'a', 'a'), - $str - ); - $str = str_replace( - array('É', 'È', 'Ê', 'Ë', 'é', 'è', 'ë', 'ê'), - array('E', 'E', 'E', 'E', 'e', 'e', 'e', 'e'), - $str ); - $str = str_replace( - array('Í', 'Ì', 'Ï', 'Î', 'í', 'ì', 'ï', 'î'), - array('I', 'I', 'I', 'I', 'i', 'i', 'i', 'i'), - $str ); - $str = str_replace( - array('Ó', 'Ò', 'Ö', 'Ô', 'ó', 'ò', 'ö', 'ô'), - array('O', 'O', 'O', 'O', 'o', 'o', 'o', 'o'), - $str ); - $str = str_replace( - array('Ú', 'Ù', 'Û', 'Ü', 'ú', 'ù', 'ü', 'û'), - array('U', 'U', 'U', 'U', 'u', 'u', 'u', 'u'), - $str ); - $str = str_replace( - array('Ñ', 'ñ', 'Ç', 'ç'), - array('N', 'n', 'C', 'c'), - $str - ); - - return $str; - } + /** * Create a new Vocabulary with the given name * @@ -73,28 +35,6 @@ public function createVocabulary($name,$slug=null) { return $this->vocabulary->create(['name' => $name,'slug' => $slug]); } - /** - * Auto create slug - * - * @param string $separator - * The separator for blank spaces - * - * @return - * Return TRUE - */ - public function autoCreateSlugs($separator=null) { - if(is_null($separator)) - $separator="-"; - $vocabularies = $this->vocabulary->where('slug',null)->get(); - - foreach($vocabularies as $vocabulary){ - $new_name = strtolower($this->cleanAccentMark($vocabulary->name)); - $new_name = str_replace(" ", $separator, $new_name); - $vocabulary->name = $new_name; - $vocabulary->save(); - } - return true; - } /** * Get a Vocabulary by ID * From d8a5021bf9cfef7d9e3e4ab3a3de3df4a765129b Mon Sep 17 00:00:00 2001 From: isaactmp Date: Wed, 26 Feb 2020 09:53:52 -0500 Subject: [PATCH 16/20] Update Taxonomy.php --- src/Taxonomy.php | 63 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index 3f55f96..c11ef32 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -14,7 +14,45 @@ public function __construct(Vocabulary $vocabulary, Term $term) { $this->vocabulary = $vocabulary; $this->term = $term; } - + /** + * Cleang string of accents mark + * + * @param string $str + * The string to clean up + * + * @return string + * Return the string purified + */ + private function cleanAccentMark($str){ + $str = str_replace( + array('Á', 'À', 'Â', 'Ä', 'á', 'à', 'ä', 'â', 'ª'), + array('A', 'A', 'A', 'A', 'a', 'a', 'a', 'a', 'a'), + $str + ); + $str = str_replace( + array('É', 'È', 'Ê', 'Ë', 'é', 'è', 'ë', 'ê'), + array('E', 'E', 'E', 'E', 'e', 'e', 'e', 'e'), + $str ); + $str = str_replace( + array('Í', 'Ì', 'Ï', 'Î', 'í', 'ì', 'ï', 'î'), + array('I', 'I', 'I', 'I', 'i', 'i', 'i', 'i'), + $str ); + $str = str_replace( + array('Ó', 'Ò', 'Ö', 'Ô', 'ó', 'ò', 'ö', 'ô'), + array('O', 'O', 'O', 'O', 'o', 'o', 'o', 'o'), + $str ); + $str = str_replace( + array('Ú', 'Ù', 'Û', 'Ü', 'ú', 'ù', 'ü', 'û'), + array('U', 'U', 'U', 'U', 'u', 'u', 'u', 'u'), + $str ); + $str = str_replace( + array('Ñ', 'ñ', 'Ç', 'ç'), + array('N', 'n', 'C', 'c'), + $str + ); + + return $str; + } /** * Create a new Vocabulary with the given name * @@ -35,6 +73,29 @@ public function createVocabulary($name,$slug=null) { return $this->vocabulary->create(['name' => $name,'slug' => $slug]); } + + /** + * Auto create slug + * + * @param string $separator + * The separator for blank spaces + * + * @return + * Return TRUE + */ + public function autoCreateSlugs($separator="-") { + + $vocabularies = $this->vocabulary->where('slug',null)->get(); + + foreach($vocabularies as $vocabulary){ + $new_name = strtolower($this->cleanAccentMark($vocabulary->name)); + $new_name = str_replace(" ", $separator, $new_name); + $vocabulary->slug = $new_name; + $vocabulary->save(); + } + return true; + } + /** * Get a Vocabulary by ID * From be504ca985f8cf45af7fea80702bf7aa32cfdd9e Mon Sep 17 00:00:00 2001 From: isaactmp Date: Thu, 27 Feb 2020 16:45:20 -0500 Subject: [PATCH 17/20] Update Slug Helper Laravel --- src/Taxonomy.php | 52 ++++++++---------------------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index c11ef32..dd7e9e2 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -14,45 +14,7 @@ public function __construct(Vocabulary $vocabulary, Term $term) { $this->vocabulary = $vocabulary; $this->term = $term; } - /** - * Cleang string of accents mark - * - * @param string $str - * The string to clean up - * - * @return string - * Return the string purified - */ - private function cleanAccentMark($str){ - $str = str_replace( - array('Á', 'À', 'Â', 'Ä', 'á', 'à', 'ä', 'â', 'ª'), - array('A', 'A', 'A', 'A', 'a', 'a', 'a', 'a', 'a'), - $str - ); - $str = str_replace( - array('É', 'È', 'Ê', 'Ë', 'é', 'è', 'ë', 'ê'), - array('E', 'E', 'E', 'E', 'e', 'e', 'e', 'e'), - $str ); - $str = str_replace( - array('Í', 'Ì', 'Ï', 'Î', 'í', 'ì', 'ï', 'î'), - array('I', 'I', 'I', 'I', 'i', 'i', 'i', 'i'), - $str ); - $str = str_replace( - array('Ó', 'Ò', 'Ö', 'Ô', 'ó', 'ò', 'ö', 'ô'), - array('O', 'O', 'O', 'O', 'o', 'o', 'o', 'o'), - $str ); - $str = str_replace( - array('Ú', 'Ù', 'Û', 'Ü', 'ú', 'ù', 'ü', 'û'), - array('U', 'U', 'U', 'U', 'u', 'u', 'u', 'u'), - $str ); - $str = str_replace( - array('Ñ', 'ñ', 'Ç', 'ç'), - array('N', 'n', 'C', 'c'), - $str - ); - - return $str; - } + /** * Create a new Vocabulary with the given name * @@ -63,14 +25,18 @@ private function cleanAccentMark($str){ * The Vocabulary object if created, FALSE if error creating, * Exception if the vocabulary name already exists. */ - public function createVocabulary($name,$slug=null) { + public function createVocabulary($name,$slug=null,$separator="-") { if ($this->vocabulary->where('name', $name)->count()) { throw new Exceptions\VocabularyExistsException(); } if (!is_null($slug)&&$this->vocabulary->where('slug', $slug)->count()) { throw new Exceptions\VocabularyExistsException(); } - + if(is_null($slug)) + $slug=str_slug($name,$separator); + else + $slug=str_slug($slug,$separator); + return $this->vocabulary->create(['name' => $name,'slug' => $slug]); } @@ -88,9 +54,7 @@ public function autoCreateSlugs($separator="-") { $vocabularies = $this->vocabulary->where('slug',null)->get(); foreach($vocabularies as $vocabulary){ - $new_name = strtolower($this->cleanAccentMark($vocabulary->name)); - $new_name = str_replace(" ", $separator, $new_name); - $vocabulary->slug = $new_name; + $vocabulary->slug = str_slug($vocabulary->name,$separator); $vocabulary->save(); } return true; From f00c09c0936dd9c3847a3882a97828c7ddd5c3d4 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Thu, 27 Feb 2020 16:50:48 -0500 Subject: [PATCH 18/20] Update Taxonomy.php --- src/Taxonomy.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Taxonomy.php b/src/Taxonomy.php index dd7e9e2..52d2ccd 100644 --- a/src/Taxonomy.php +++ b/src/Taxonomy.php @@ -26,16 +26,17 @@ public function __construct(Vocabulary $vocabulary, Term $term) { * Exception if the vocabulary name already exists. */ public function createVocabulary($name,$slug=null,$separator="-") { + if(is_null($slug)) + $slug=str_slug($name,$separator); + else + $slug=str_slug($slug,$separator); + if ($this->vocabulary->where('name', $name)->count()) { throw new Exceptions\VocabularyExistsException(); } if (!is_null($slug)&&$this->vocabulary->where('slug', $slug)->count()) { throw new Exceptions\VocabularyExistsException(); } - if(is_null($slug)) - $slug=str_slug($name,$separator); - else - $slug=str_slug($slug,$separator); return $this->vocabulary->create(['name' => $name,'slug' => $slug]); } From 770f28addfce2f3c513fde550c79468d2ff18fc0 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Thu, 27 Feb 2020 17:01:41 -0500 Subject: [PATCH 19/20] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 14842fa..b993738 100644 --- a/README.md +++ b/README.md @@ -95,10 +95,12 @@ class Car extends \Eloquent { ## Usage -Creating a vocabulary: +Creating a vocabulary (per default, the separator is "-"): ```php -Taxonomy::createVocabulary('Cars'); +Taxonomy::createVocabulary('Cars'); // Taxonomy Object [Cars,cars] +Taxonomy::createVocabulary('Cars','cars-slug'); // Taxonomy Object [Cars,cars-slug] +Taxonomy::createVocabulary('Cars','Cars Slug','-'); // Taxonomy Object [Cars,cars-slug] ``` Retrieving a Vocabulary: @@ -106,6 +108,7 @@ Retrieving a Vocabulary: ```php $vocabulary = Taxonomy::getVocabulary(1); // Using ID $vocabulary = Taxonomy::getVocabularyByName('Cars'); // Using Name +$vocabulary = Taxonomy::getVocabularyBySlug('cars-slug'); // Using Slug ``` Deleting a Vocabulary: @@ -113,6 +116,7 @@ Deleting a Vocabulary: ```php Taxonomy::deleteVocabulary(1); // Using ID Taxonomy::deleteVocabularyByName('Cars'); // Using Name +Taxonomy::deleteVocabularyBySlug('cars-slug'); // Using Slug ``` Adding a Term to a vocabulary: From b8695e4c129f2d37d22e807d220490ecef6f21c5 Mon Sep 17 00:00:00 2001 From: isaactmp Date: Thu, 27 Feb 2020 18:00:29 -0500 Subject: [PATCH 20/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b993738..2b3da0a 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ class Car extends \Eloquent { ## Usage -Creating a vocabulary (per default, the separator is "-"): +Creating a vocabulary (by default, the separator is "-"): ```php Taxonomy::createVocabulary('Cars'); // Taxonomy Object [Cars,cars]