Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow for configurable file extensions #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow for configurable file extensions #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19fb6ea
template file extension now configurable
dxprog Oct 28, 2015
97d156c
updated tests for custom extension
dxprog Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/Dust/Dust.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ class Dust implements \Serializable {

public $autoloaderOverride;

public function __construct($parser = null, $evaluator = null) {
// Default template extension
private $_extension = 'dust';

public function __construct($parser = null, $evaluator = null, $options = null) {
if ($parser === null) $parser = new Parse\Parser();
if ($evaluator === null) $evaluator = new Evaluate\Evaluator($this);
$this->parser = $parser;
Expand Down Expand Up @@ -47,6 +50,14 @@ public function __construct($parser = null, $evaluator = null) {
"contextDump" => new Helper\ContextDump()
];
$this->automaticFilters = [$this->filters['h']];

if (is_array($options)) {
if (isset($options['extension'])) {
$extension = $options['extension'];
$this->_extension = $extension{0} === '.' ? substr($extension, 1) : $extension;
}
}

}

public function compile($source, $name = null) {
Expand All @@ -62,7 +73,10 @@ public function compileFn($source, $name = null) {

public function resolveAbsoluteDustFilePath($path, $basePath = null) {
//add extension if necessary
if (substr_compare($path, '.dust', -5, 5) !== 0) $path .= '.dust';
$ext = explode('.', $path);
if (end($ext) !== $this->_extension) {
$path .= '.' . $this->_extension;
}
if ($basePath != null) {
$possible = realpath($basePath . '/' . $path);
if ($possible !== false) return $possible;
Expand Down
26 changes: 20 additions & 6 deletions tests/Dust/FilesystemTest.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class FilesystemTest extends DustTestBase {
public static $dir;

public static function setUpBeforeClass() {
FilesystemTest::$dir = sys_get_temp_dir();
if (FilesystemTest::$dir[strlen(FilesystemTest::$dir) - 1] != '/') FilesystemTest::$dir .= '/';
Expand All @@ -18,8 +18,14 @@ public static function setUpBeforeClass() {
//add child template
$fileRes = file_put_contents(FilesystemTest::$dir . '/childTemplate.dust', '{>baseTemplate/}{<two}newTwo{/two}{<three}newThree{/three}');
if ($fileRes === false) throw new DustException('Unable to create template');

// Add template with custom extension
$fileRes = file_put_contents(FilesystemTest::$dir . '/simpleTemplate.tl', 'line1{~n}line2');
if ($fileRes === false) {
throw new DustException('Unable to create template');
}
}

public static function deleteTree($dir) {
foreach (scandir($dir) as $file) {
if ($file != '.' && $file != '..') {
Expand All @@ -29,23 +35,31 @@ public static function deleteTree($dir) {
}
return rmdir($dir);
}

public static function tearDownAfterClass() {
if (!FilesystemTest::deleteTree(FilesystemTest::$dir)) throw new DustException('Unable to delete dir: ' . FilesystemTest::$dir);
}

public function testSimpleBlock() {
//just run the child, it should auto-find the base
$compiled = $this->dust->compileFile(FilesystemTest::$dir . '/childTemplate');
$expected = "before\noneDefault...newTwo...newThree\nafter";
$this->assertEquals($expected, $this->dust->renderTemplate($compiled, (object)[]));
}

public function testIncludedDirectories() {
//add the dir
$this->dust->includedDirectories[] = FilesystemTest::$dir;
//now have something call the child
$this->assertTemplate("Begin - before\noneDefault...newTwo...newThree\nafter - End", 'Begin - {>childTemplate/} - End', (object)[]);
}


public function testCustomFileExtension() {
$dust = new Dust(null, null, [ 'extension' => 'tl' ]);
$dust->includedDirectories[] = FilesystemTest::$dir;
$template = $dust->compile('{>simpleTemplate/}');
$render = $dust->renderTemplate($template, (object)[]);
$this->assertEquals($render, "line1\nline2");
}

}