Merge branch 'feature/pragma' into feature/pragma-dot-notation
This commit is contained in:
+64
-2
@@ -30,6 +30,9 @@ class Mustache {
|
|||||||
protected $template = '';
|
protected $template = '';
|
||||||
protected $context = array();
|
protected $context = array();
|
||||||
protected $partials = array();
|
protected $partials = array();
|
||||||
|
protected $pragmas = array();
|
||||||
|
|
||||||
|
protected $pragmasImplemented = array('DOT-NOTATION');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mustache class constructor.
|
* Mustache class constructor.
|
||||||
@@ -101,6 +104,7 @@ class Mustache {
|
|||||||
* @return string Rendered Mustache template.
|
* @return string Rendered Mustache template.
|
||||||
*/
|
*/
|
||||||
protected function _render($template, &$context) {
|
protected function _render($template, &$context) {
|
||||||
|
$template = $this->renderPragmas($template, $context);
|
||||||
$template = $this->renderSection($template, $context);
|
$template = $this->renderSection($template, $context);
|
||||||
return $this->renderTags($template, $context);
|
return $this->renderTags($template, $context);
|
||||||
}
|
}
|
||||||
@@ -162,6 +166,60 @@ class Mustache {
|
|||||||
return $template;
|
return $template;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize pragmas and remove all pragma tags.
|
||||||
|
*
|
||||||
|
* @access protected
|
||||||
|
* @param string $template
|
||||||
|
* @param array &$context
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function renderPragmas($template, &$context) {
|
||||||
|
// no pragmas
|
||||||
|
if (strpos($template, $this->otag . '%') === false) {
|
||||||
|
return $template;
|
||||||
|
}
|
||||||
|
|
||||||
|
$otag = $this->prepareRegEx($this->otag);
|
||||||
|
$ctag = $this->prepareRegEx($this->ctag);
|
||||||
|
$regex = '/' . $otag . '%([\\w_-]+)((?: [\\w]+=[\\w]+)*)' . $ctag . '\\n?/';
|
||||||
|
return preg_replace_callback($regex, array($this, 'renderPragma'), $template);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A preg_replace helper to remove {{%PRAGMA}} tags and enable requested pragma.
|
||||||
|
*
|
||||||
|
* @access protected
|
||||||
|
* @param mixed $matches
|
||||||
|
* @return void
|
||||||
|
* @throws MustacheException unknown pragma
|
||||||
|
*/
|
||||||
|
protected function renderPragma($matches) {
|
||||||
|
$pragma = $matches[0];
|
||||||
|
$pragma_name = $matches[1];
|
||||||
|
$options_string = $matches[2];
|
||||||
|
|
||||||
|
if (!in_array($pragma_name, $this->pragmasImplemented)) {
|
||||||
|
throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
|
||||||
|
}
|
||||||
|
|
||||||
|
$options = array();
|
||||||
|
foreach (explode(' ', trim($options_string)) as $o) {
|
||||||
|
if ($p = trim($o)) {
|
||||||
|
$p = explode('=', trim($p));
|
||||||
|
$options[$p[0]] = $p[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($options)) {
|
||||||
|
$this->pragmas[$pragma_name] = true;
|
||||||
|
} else {
|
||||||
|
$this->pragmas[$pragma_name] = $options;
|
||||||
|
}
|
||||||
|
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loop through and render individual Mustache tags.
|
* Loop through and render individual Mustache tags.
|
||||||
*
|
*
|
||||||
@@ -175,8 +233,8 @@ class Mustache {
|
|||||||
return $template;
|
return $template;
|
||||||
}
|
}
|
||||||
|
|
||||||
$otag = $this->prepareRegEx($this->otag);
|
$otag = $this->prepareRegEx($this->otag);
|
||||||
$ctag = $this->prepareRegEx($this->ctag);
|
$ctag = $this->prepareRegEx($this->ctag);
|
||||||
$this->tagRegEx = '/' . $otag . "(#|\/|=|!|>|\\{|&)?([^\/#]+?)\\1?" . $ctag . "+/";
|
$this->tagRegEx = '/' . $otag . "(#|\/|=|!|>|\\{|&)?([^\/#]+?)\\1?" . $ctag . "+/";
|
||||||
$html = '';
|
$html = '';
|
||||||
$matches = array();
|
$matches = array();
|
||||||
@@ -466,4 +524,8 @@ class MustacheException extends Exception {
|
|||||||
// with no associated partial.
|
// with no associated partial.
|
||||||
const UNKNOWN_PARTIAL = 3;
|
const UNKNOWN_PARTIAL = 3;
|
||||||
|
|
||||||
|
// An UNKNOWN_PRAGMA exception is thrown whenever a {{%PRAGMA}} tag appears
|
||||||
|
// which can't be handled by this Mustache instance.
|
||||||
|
const UNKNOWN_PRAGMA = 4;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require_once '../Mustache.php';
|
||||||
|
require_once 'PHPUnit/Framework.php';
|
||||||
|
|
||||||
|
class MustachePragmaTest extends PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
|
public function testUnknownPragmaException() {
|
||||||
|
$m = new Mustache();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$m->render('{{%I-HAVE-THE-GREATEST-MUSTACHE}}');
|
||||||
|
} catch (MustacheException $e) {
|
||||||
|
$this->assertEquals(MustacheException::UNKNOWN_PRAGMA, $e->getCode(), 'Caught exception code was not MustacheException::UNKNOWN_PRAGMA');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->fail('Mustache should have thrown an unknown pragma exception');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testPragmaReplace() {
|
||||||
|
$m = new Mustache();
|
||||||
|
$this->assertEquals($m->render('{{%DOT-NOTATION}}'), '', 'Pragma tag not removed');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testPragmaReplaceMultiple() {
|
||||||
|
$m = new Mustache();
|
||||||
|
$this->assertEquals($m->render("{{%DOT-NOTATION}}\n{{%DOT-NOTATION}}"), '', 'Multiple pragma tags not removed');
|
||||||
|
$this->assertEquals($m->render('{{%DOT-NOTATION}} {{%DOT-NOTATION}}'), ' ', 'Multiple pragma tags not removed');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testPragmaReplaceNewline() {
|
||||||
|
$m = new Mustache();
|
||||||
|
$this->assertEquals($m->render("{{%DOT-NOTATION}}\n"), '', 'Trailing newline after pragma tag not removed');
|
||||||
|
$this->assertEquals($m->render("\n{{%DOT-NOTATION}}\n"), "\n", 'Too many newlines removed with pragma tag');
|
||||||
|
$this->assertEquals($m->render("1\n2{{%DOT-NOTATION}}\n3"), "1\n23", 'Wrong newline removed with pragma tag');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user