Use class name as cache key

This commit is contained in:
Amit Snyderman
2013-09-06 09:16:40 -04:00
parent 8894d68482
commit 1937752519
3 changed files with 10 additions and 10 deletions
+5 -5
View File
@@ -2,12 +2,12 @@
class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
{ {
private $directory; private $baseDir;
private $fileMode; private $fileMode;
public function __construct($directory, $fileMode = null) public function __construct($baseDir, $fileMode = null)
{ {
$this->directory = $directory; $this->baseDir = $baseDir;
$this->fileMode = $fileMode; $this->fileMode = $fileMode;
} }
@@ -39,7 +39,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
protected function getCacheFilename($name) protected function getCacheFilename($name)
{ {
return sprintf('%s/%s.php', $this->directory, md5($name)); return sprintf('%s/%s.php', $this->baseDir, $name);
} }
private function buildDirectoryForFilename($fileName) private function buildDirectoryForFilename($fileName)
@@ -76,7 +76,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
$mode = isset($this->fileMode) ? $this->fileMode : (0666 & ~umask()); $mode = isset($this->fileMode) ? $this->fileMode : (0666 & ~umask());
@chmod($fileName, $mode); @chmod($fileName, $mode);
return $fileName; return;
} }
$this->log( $this->log(
+2 -2
View File
@@ -11,8 +11,8 @@ class Mustache_Cache_NoopCache extends Mustache_Cache_AbstractCache
{ {
$this->log( $this->log(
Mustache_Logger::WARNING, Mustache_Logger::WARNING,
'Template cache disabled, evaluating class at runtime', 'Template cache disabled, evaluating "{className}" class at runtime',
array() array('className' => $className)
); );
eval("?>".$compiled); eval("?>".$compiled);
} }
+3 -3
View File
@@ -506,7 +506,7 @@ class Mustache_Engine
public function getCache() public function getCache()
{ {
if (!isset($this->cache)) { if (!isset($this->cache)) {
$this->cache = new Mustache_Cache_NoopCache(); $this->setCache(new Mustache_Cache_NoopCache());
} }
return $this->cache; return $this->cache;
@@ -613,9 +613,9 @@ class Mustache_Engine
if (!isset($this->templates[$className])) { if (!isset($this->templates[$className])) {
if (!class_exists($className, false)) { if (!class_exists($className, false)) {
if (!$this->getCache()->load($source)) { if (!$this->getCache()->load($className)) {
$compiled = $this->compile($source); $compiled = $this->compile($source);
$this->getCache()->cache($source, $compiled); $this->getCache()->cache($className, $compiled);
} }
} }