Make sure hierarchy works

Author: Nyholm

README.md

@@ -16,8 +16,7 @@ for ($i = 0; $i < 100; $i++) {
 
 $pool->hasItem('|users|4711|followers|12|likes'); // True
 
-$item = $pool->getItem('|users|4711|followers');
-$pool->deleteItem($item);
+$pool->deleteItem('|users|4711|followers');
 
 $pool->hasItem('|users|4711|followers|12|likes'); // False
 ```

src/HierarchicalCachePool.php

@@ -11,7 +11,9 @@
 
 namespace Cache\Hierarchy;
 
+use Cache\Adapter\Common\CacheItem;
 use Cache\Adapter\Common\Exception\InvalidArgumentException;
+use Cache\Taggable\TaggableItemInterface;
 use Cache\Taggable\TaggablePoolInterface;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
@@ -42,11 +44,23 @@ public function __construct(CacheItemPoolInterface $cache)
      */
     public function getItem($key, array $tags = [])
     {
-        if (!$this->isHierarchyKey($key)) {
-            return $this->cache->getItem($key, $tags);
+        $item = $this->cache->getItem($key, $tags);
+        if (!$this->isHierarchyKey($key) || !$item->isHit()) {
+            return $item;
         }
 
-        // TODO: Implement getItem() method.
+        if (!$this->validateParents($key, $tags)) {
+            return $item;
+        }
+
+        // Invalid item
+        if ($item instanceof TaggableItemInterface) {
+            $key = $item->getTaggedKey();
+        } else {
+            $key = $item->getKey();
+        }
+
+        return new CacheItem($key);
     }
 
     /**
@@ -67,10 +81,12 @@ public function getItems(array $keys = [], array $tags = [])
      */
     public function hasItem($key, array $tags = [])
     {
-        if (!$this->isHierarchyKey($key)) {
-            return $this->cache->hasItem($key, $tags);
+        $hasItem = $this->cache->hasItem($key, $tags);
+        if (!$this->isHierarchyKey($key) || $hasItem === false) {
+            return $hasItem;
         }
-        // TODO: Implement hasItem() method.
+
+        return $this->validateParents($key, $tags);
     }
 
     /**
@@ -86,30 +102,31 @@ public function clear(array $tags = [])
      */
     public function deleteItem($key, array $tags = [])
     {
-        if (!$this->isHierarchyKey($key)) {
-            return $this->cache->deleteItem($key, $tags);
-        }
-        // TODO: Implement deleteItem() method.
+        return $this->cache->deleteItem($key, $tags);
     }
 
     /**
      * {@inheritdoc}
      */
     public function deleteItems(array $keys, array $tags = [])
     {
-        $result = true;
-        foreach ($keys as $key) {
-            $result = $result && $this->deleteItem($key, $tags);
-        }
-
-        return $result;
+        return $this->cache->deleteItems($keys, $tags);
     }
 
     /**
      * {@inheritdoc}
      */
     public function save(CacheItemInterface $item)
     {
+        $parts = $this->explodeKey($item->getKey());
+        $parentKey = '';
+        foreach ($parts as $part) {
+            $parentKey .= $part;
+            $parent = $this->cache->getItem($parentKey);
+            $parent->set(null);
+            $this->cache->save($parent);
+        }
+
         return $this->cache->save($item);
     }
 
@@ -143,4 +160,42 @@ private function isHierarchyKey($key)
 
         return substr($key, 0, 1) === self::SEPARATOR;
     }
+
+    /**
+     * @param string $key
+     * @param array  $tags
+     *
+     * @return bool true if parents are valid
+     */
+    private function validateParents($key, array $tags)
+    {
+        $parts = $this->explodeKey($key);
+        $parentKey = '';
+        foreach ($parts as $part) {
+            $parentKey .= $part;
+            if (!$this->cache->hasItem($parentKey, $tags)) {
+                // Invalid item
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param CacheItemInterface $item
+     *
+     * @return array
+     */
+    private function explodeKey($key)
+    {
+        $parts = explode(self::SEPARATOR, $key);
+
+        unset($parts[0]);
+        foreach ($parts as &$part) {
+            $part = self::SEPARATOR.$part;
+        }
+
+        return $parts;
+    }
 }

tests/HierarchicalCachePoolTest.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of php-cache\apc-adapter package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>, Tobias Nyholm <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Cache\Hierarchy;
+
+use Cache\Adapter\Apc\ApcCachePool;
+use Cache\Adapter\PHPArray\ArrayCachePool;
+use Cache\IntegrationTests\CachePoolTest as BaseTest;
+
+class HierarchicalCachePoolTest  extends \PHPUnit_Framework_TestCase
+{
+    private $cache;
+
+    public function createCachePool()
+    {
+        return new HierarchicalCachePool($this->getCache());
+    }
+
+    public function getCache()
+    {
+        if ($this->cache === null) {
+            $this->cache = new ArrayCachePool();
+        }
+
+        return $this->cache;
+    }
+
+    public function testBasicUsage()
+    {
+        $pool = $this->createCachePool();
+        $user = 4711;
+        for ($i = 0; $i < 10; $i++) {
+            $item = $pool->getItem(sprintf('|users|%d|followers|%d|likes', $user, $i));
+            $item->set('Justin Bieber');
+            $pool->save($item);
+        }
+
+        $this->assertTrue($pool->hasItem('|users|4711|followers|4|likes'));
+        $pool->deleteItem('|users|4711|followers');
+        $this->assertFalse($pool->hasItem('|users|4711|followers|4|likes'));
+    }
+}

tests/IntegrationPoolTest.php

@@ -11,11 +11,10 @@
 
 namespace Cache\Hierarchy;
 
-use Cache\Adapter\Apc\ApcCachePool;
 use Cache\Adapter\PHPArray\ArrayCachePool;
-use Cache\IntegrationTests\CachePoolTest as BaseTest;
+use Cache\IntegrationTests\CachePoolTest;
 
-class IntegrationPoolTest extends BaseTest
+class IntegrationPoolTest extends CachePoolTest
 {
     private $cache;
 

tests/IntegrationTagTest.php

@@ -11,7 +11,6 @@
 
 namespace Cache\Hierarchy;
 
-use Cache\Adapter\Apc\ApcCachePool;
 use Cache\Adapter\PHPArray\ArrayCachePool;
 use Cache\IntegrationTests\TaggableCachePoolTest;