update Cache to specify key paths with dot syntax, like Cache::write('my.key.is.here', $data);

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5866 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-10-22 20:39:36 +00:00
parent aaca183da1
commit a9a9a824e2
2 changed files with 35 additions and 6 deletions

View file

@ -191,10 +191,10 @@ class Cache extends Object {
return false; return false;
} }
$key = strval($key); if (!$key = $_this->__key($key)) {
if (empty($key)) {
return false; return false;
} }
if (is_resource($value)) { if (is_resource($value)) {
return false; return false;
} }
@ -228,8 +228,7 @@ class Cache extends Object {
if (!$_this->isInitialized($engine)) { if (!$_this->isInitialized($engine)) {
return false; return false;
} }
$key = strval($key); if (!$key = $_this->__key($key)) {
if (empty($key)) {
return false; return false;
} }
$success = $_this->_Engine[$engine]->read($key); $success = $_this->_Engine[$engine]->read($key);
@ -253,10 +252,11 @@ class Cache extends Object {
if (!$_this->isInitialized($engine)) { if (!$_this->isInitialized($engine)) {
return false; return false;
} }
$key = strval($key);
if (empty($key)) { if (!$key = $_this->__key($key)) {
return false; return false;
} }
$success = $_this->_Engine[$engine]->delete($key); $success = $_this->_Engine[$engine]->delete($key);
$_this->_Engine[$engine]->init($settings); $_this->_Engine[$engine]->init($settings);
return $success; return $success;
@ -317,6 +317,20 @@ class Cache extends Object {
} }
return array(); return array();
} }
/**
* generates a safe key
*
* @param string $key the key passed over
* @return mixed string $key or false
* @access private
*/
function __key($key) {
if (empty($key)) {
return false;
}
$key = r(array(DS, '/', '.'), '_', strval($key));
return $key;
}
} }
/** /**
* Storage engine for CakePHP caching * Storage engine for CakePHP caching

View file

@ -50,6 +50,9 @@ class FileEngineTest extends UnitTestCase {
} }
function testReadAndWriteCache() { function testReadAndWriteCache() {
$result = Cache::write(null, 'here');
$this->assertFalse($result);
$result = Cache::read('test'); $result = Cache::read('test');
$expecting = ''; $expecting = '';
$this->assertEqual($result, $expecting); $this->assertEqual($result, $expecting);
@ -151,6 +154,18 @@ class FileEngineTest extends UnitTestCase {
} }
function testKeyPath() {
$result = Cache::write('views.countries.something', 'here');
$this->assertTrue($result);
$this->assertTrue(file_exists(CACHE . 'cake_views_countries_something'));
$result = Cache::read('views.countries.something');
$this->assertEqual($result, 'here');
$result = Cache::clear();
$this->assertTrue($result);
}
function tearDown() { function tearDown() {
Cache::config('default'); Cache::config('default');
} }