added Cache::NAMESPACES and support for cleaning namespace in FileStorage [Closes #52]

Author: Jirka F

src/Caching/Cache.php

@@ -31,6 +31,7 @@ class Cache
 		ITEMS = 'items',
 		CONSTS = 'consts',
 		CALLBACKS = 'callbacks',
+		NAMESPACES = 'namespaces',
 		ALL = 'all';
 
 	/** @internal */
@@ -198,6 +199,11 @@ private function completeDependencies(?array $dp): array
 			$dp[self::TAGS] = array_values((array) $dp[self::TAGS]);
 		}
 
+		// make list from NAMESPACES
+		if (isset($dp[self::NAMESPACES])) {
+			$dp[self::NAMESPACES] = array_values((array) $dp[self::NAMESPACES]);
+		}
+
 		// convert FILES into CALLBACKS
 		if (isset($dp[self::FILES])) {
 			foreach (array_unique((array) $dp[self::FILES]) as $item) {

src/Caching/Storages/FileStorage.php

@@ -249,6 +249,7 @@ public function clean(array $conditions): void
 	{
 		$all = !empty($conditions[Cache::ALL]);
 		$collector = empty($conditions);
+		$namespaces = $conditions[Cache::NAMESPACES] ?? null;
 
 		// cleaning using file iterator
 		if ($all || $collector) {
@@ -284,6 +285,17 @@ public function clean(array $conditions): void
 				$this->journal->clean($conditions);
 			}
 			return;
+
+		} elseif ($namespaces) {
+			foreach ($namespaces as $namespace) {
+				$dir = $this->dir . '/_' . urlencode($namespace);
+				if (is_dir($dir)) {
+					foreach (Nette\Utils\Finder::findFiles('_*')->in($dir) as $entry) {
+						$this->delete((string) $entry);
+					}
+					@rmdir($dir); // may already contain new files
+				}
+			}
 		}
 
 		// cleaning using journal

tests/Storages/FileStorage.clean-namespace.phpt

@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Test: Nette\Caching\Storages\FileStorage clean with Cache::NAMESPACE
+ */
+
+declare(strict_types=1);
+
+use Nette\Caching\Cache;
+use Nette\Caching\Storages\FileStorage;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+$storage = new FileStorage(TEMP_DIR);
+
+/*
+ * Create filestorage cache without namespace and some with namespaces
+ */
+$cacheA = new Cache($storage);
+$cacheB = new Cache($storage, 'C' . Cache::NAMESPACE_SEPARATOR . 'A');
+$cacheC = new Cache($storage, 'C');
+$cacheD = new Cache($storage, 'D');
+
+/*
+ * Fill with data
+ */
+$cacheA->save('test1', 'David');
+$cacheA->save('test2', 'Grudl');
+
+$cacheB->save('test1', 'Barry');
+$cacheB->save('test2', 'Allen');
+
+$cacheC->save('test1', 'Oliver');
+$cacheC->save('test2', 'Queen');
+
+$cacheD->save('test1', 'Bruce');
+$cacheD->save('test2', 'Wayne');
+
+
+/*
+ * Check if fill wass successfull
+ */
+Assert::same('David', $cacheA->load('test1'));
+Assert::same('Grudl', $cacheA->load('test2'));
+
+Assert::same('Barry', $cacheB->load('test1'));
+Assert::same('Allen', $cacheB->load('test2'));
+
+Assert::same('Oliver', $cacheC->load('test1'));
+Assert::same('Queen', $cacheC->load('test2'));
+
+Assert::same('Bruce', $cacheD->load('test1'));
+Assert::same('Wayne', $cacheD->load('test2'));
+
+
+/*
+ * Clean one namespace
+ */
+$storage->clean([Cache::NAMESPACES => [$cacheB->getNamespace()]]);
+
+Assert::same('David', $cacheA->load('test1'));
+Assert::same('Grudl', $cacheA->load('test2'));
+
+// Only these should be null now
+Assert::null($cacheB->load('test1'));
+Assert::null($cacheB->load('test2'));
+
+Assert::same('Oliver', $cacheC->load('test1'));
+Assert::same('Queen', $cacheC->load('test2'));
+
+Assert::same('Bruce', $cacheD->load('test1'));
+Assert::same('Wayne', $cacheD->load('test2'));
+
+
+/*
+ * Test cleaning multiple namespaces
+ */
+$storage->clean([Cache::NAMESPACES => [$cacheC->getNamespace(), $cacheD->getNamespace()]]);
+
+Assert::same('David', $cacheA->load('test1'));
+Assert::same('Grudl', $cacheA->load('test2'));
+
+// All other should be null
+Assert::null($cacheB->load('test1'));
+Assert::null($cacheB->load('test2'));
+
+Assert::null($cacheC->load('test1'));
+Assert::null($cacheC->load('test2'));
+
+Assert::null($cacheD->load('test1'));
+Assert::null($cacheD->load('test2'));