Merge pull request #22 from joomlatools/feature/21-operator

Allow strict matching

Author: ercanozkaya

database/behavior/taggable.php

@@ -16,6 +16,13 @@
  */
 class ComTagsDatabaseBehaviorTaggable extends KDatabaseBehaviorAbstract
 {
+    protected function _initialize(KObjectConfig $config)
+    {
+        $config->append(array('strict' => false));
+
+        parent::_initialize($config);
+    }
+
     /**
      * Get a list of tags
      *
@@ -48,9 +55,21 @@ protected function _beforeSelect(KDatabaseContext $context)
         {
             $package = $this->getMixer()->getIdentifier()->package;
 
-            $query->join($package.'_tags_relations AS tags_relations', 'tags_relations.row = tbl.uuid');
-            $query->join($package.'_tags AS tags', 'tags.tag_id = tags_relations.tag_id');
-            $query->where('tags.slug IN :tag');
+
+            if ($this->getConfig()->strict)
+            {
+                $tags = KObjectConfig::unbox($this->getConfig()->tags);
+
+                for ($i = 0; $i < count($tags); $i++) {
+                    $query->join("{$package}_tags_relations AS tags_relations{$i}", "tags_relations{$i}.row = tbl.uuid")
+                          ->join("{$package}_tags AS tags{$i}", "tags{$i}.tag_id = tags_relations{$i}.tag_id", 'INNER')
+                          ->where("tags{$i}.slug = :tag{$i}")
+                          ->bind(array("tag{$i}" => $tags[$i]));
+                }
+            }
+            else $query->join($package . '_tags_relations AS tags_relations', 'tags_relations{$i}.row = tbl.uuid')
+                      ->join($package . '_tags AS tags', 'tags.tag_id = tags_relations.tag_id')
+                      ->where('tags.slug IN :tag');
         }
     }
 }

model/behavior/taggable.php

@@ -38,7 +38,8 @@ public function __construct(KObjectConfig $config)
     protected function _initialize(KObjectConfig $config)
     {
         $config->append(array(
-            'priority' => KBehaviorAbstract::PRIORITY_HIGH
+            'priority' => KBehaviorAbstract::PRIORITY_HIGH,
+            'strict'   => false
         ));
 
         parent::_initialize($config);
@@ -65,7 +66,11 @@ public function onMixin(KObjectMixable $mixer)
     protected function _makeTaggable(KModelContextInterface $context)
     {
         $model = $context->getSubject();
-        $model->getTable()->addBehavior('com:tags.database.behavior.taggable');
+
+        $model->getTable()->addBehavior('com:tags.database.behavior.taggable', array(
+            'tags'   => $model->getState()->tag,
+            'strict' => $this->getConfig()->strict
+        ));
     }
 
     /**