Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/higher-order-sections

Browse Source 
Conflicts:
	Mustache.php
This commit is contained in:
Justin Hileman
2011-09-10 14:03:23 -07:00
parent e4dc585c03 ccf4b33666
commit 9f7ab9d362
3 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+41 -39
View File
@@ -14,6 +14,9 @@
*/
class Mustache {
const VERSION = '0.7.1';
const SPEC_VERSION = '1.1.2';
/**
* Should this Mustache throw exceptions when it finds unexpected tags?
*
@@ -176,6 +179,9 @@ class Mustache {
if ($template === null) $template = $this->_template;
if ($partials !== null) $this->_partials = $partials;
$otag_orig = $this->_otag;
$ctag_orig = $this->_ctag;
if ($view) {
$this->_context = array($view);
} else if (empty($this->_context)) {
@@ -183,7 +189,12 @@ class Mustache {
}
$template = $this->_renderPragmas($template);
return $this->_renderTemplate($template, $this->_context);
$template = $this->_renderTemplate($template, $this->_context);
$this->_otag = $otag_orig;
$this->_ctag = $ctag_orig;
return $template;
}
/**
@@ -211,28 +222,18 @@ class Mustache {
* @return string Rendered Mustache template.
*/
protected function _renderTemplate($template) {
$template = $this->_renderSections($template);
return $this->_renderTags($template);
}
if ($section = $this->_findSection($template)) {
list($before, $type, $tag_name, $content, $after) = $section;
/**
* Render boolean, enumerable and inverted sections.
*
* @access protected
* @param string $template
* @return string
*/
protected function _renderSections($template) {
while ($section_data = $this->_findSection($template)) {
list($section, $offset, $type, $tag_name, $content) = $section_data;
$rendered_before = $this->_renderTags($before);
$replace = '';
$rendered_content = '';
$val = $this->_getVariable($tag_name);
switch($type) {
// inverted section
case '^':
if (empty($val)) {
$replace .= $content;
$rendered_content = $this->_renderTemplate($content);
}
break;
@@ -240,30 +241,29 @@ class Mustache {
case '#':
// higher order sections
if ($this->_varIsCallable($val)) {
$content = call_user_func($val, $content);
$replace .= $this->_renderTemplate($content);
$rendered_content = $this->_renderTemplate(call_user_func($val, $content));
} else if ($this->_varIsIterable($val)) {
foreach ($val as $local_context) {
$this->_pushContext($local_context);
$replace .= $this->_renderTemplate($content);
$rendered_content .= $this->_renderTemplate($content);
$this->_popContext();
}
} else if ($val) {
if (is_array($val) || is_object($val)) {
$this->_pushContext($val);
$replace .= $this->_renderTemplate($content);
$rendered_content = $this->_renderTemplate($content);
$this->_popContext();
} else {
$replace .= $content;
$rendered_content = $this->_renderTemplate($content);
}
}
break;
}
$template = substr_replace($template, $replace, $offset, strlen($section));
return $rendered_before . $rendered_content . $this->_renderTemplate($after);
}
return $template;
return $this->_renderTags($template);
}
/**
@@ -276,7 +276,7 @@ class Mustache {
*/
protected function _prepareSectionRegEx($otag, $ctag) {
return sprintf(
'/(?:(?<=\\n)[ \\t]*)?%s(?P<type>[%s])(?P<tag_name>.+?)%s\\n?/s',
'/(?:(?<=\\n)[ \\t]*)?%s(?:(?P<type>[%s])(?P<tag_name>.+?)|=(?P<delims>.*?)=)%s\\n?/s',
preg_quote($otag, '/'),
self::SECTION_TYPES,
preg_quote($ctag, '/')
@@ -284,13 +284,11 @@ class Mustache {
}
/**
* Extract a section from $template.
*
* This is a helper function to find sections needed by _renderSections.
* Extract the first section from $template.
*
* @access protected
* @param string $template
* @return array $section, $offset, $type, $tag_name and $content
* @return array $before, $type, $tag_name, $content and $after
*/
protected function _findSection($template) {
$regEx = $this->_prepareSectionRegEx($this->_otag, $this->_ctag);
@@ -304,6 +302,12 @@ class Mustache {
$section_stack = array();
$matches = array();
while (preg_match($regEx, $template, $matches, PREG_OFFSET_CAPTURE, $search_offset)) {
if (isset($matches['delims'][0])) {
list($otag, $ctag) = explode(' ', $matches['delims'][0]);
$regEx = $this->_prepareSectionRegEx($otag, $ctag);
$search_offset = $matches[0][1] + strlen($matches[0][0]);
continue;
}
$match = $matches[0][0];
$offset = $matches[0][1];
@@ -330,10 +334,14 @@ class Mustache {
}
if (empty($section_stack)) {
$section = substr($template, $section_start, $search_offset - $section_start);
$content = substr($template, $content_start, $offset - $content_start);
return array($section, $section_start, $section_type, $tag_name, $content);
// $before, $type, $tag_name, $content, $after
return array(
substr($template, 0, $section_start),
$section_type,
$tag_name,
substr($template, $content_start, $offset - $content_start),
substr($template, $search_offset),
);
}
break;
}
@@ -489,9 +497,6 @@ class Mustache {
return $template;
}
$otag_orig = $this->_otag;
$ctag_orig = $this->_ctag;
$first = true;
$this->_tagRegEx = $this->_prepareTagRegEx($this->_otag, $this->_ctag, true);
@@ -531,9 +536,6 @@ class Mustache {
}
}
$this->_otag = $otag_orig;
$this->_ctag = $ctag_orig;
return $html . $template;
}
@@ -578,7 +580,7 @@ class Mustache {
case '#':
case '^':
case '/':
// remove any leftovers from _renderSections
// remove any leftover section tags
return $leading . $trailing;
break;
default:
README.markdown
+3 -6
View File
@@ -81,15 +81,12 @@ And render it:
Known Issues
------------
* As of v1.1.2, there are a couple of whitespace bugs around section tags.
* Things get weird when you change delimiters inside a section -- `delimiters` example currently fails with an
"unclosed section" exception.
* The current spec test exposes several whitespace bugs (which are mostly instances of the exact same whitespace
bug) ... Despite these failing tests, this version is actually *closer* to correct than previous releases.
* As of Mustache spec v1.1.2, there are a couple of whitespace bugs around section tags... Despite these failing tests, this
version is actually *closer* to correct than previous releases.
See Also
--------
* [Readme for the Ruby Mustache implementation](http://github.com/defunkt/mustache/blob/master/README.md).
* [mustache(1)](http://defunkt.github.com/mustache/mustache.1.html) and [mustache(5)](http://defunkt.github.com/mustache/mustache.5.html) man pages.
* [mustache(1)](http://mustache.github.com/mustache.1.html) and [mustache(5)](http://mustache.github.com/mustache.5.html) man pages.
test/MustacheTest.php
+36 -1
View File
@@ -36,7 +36,7 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
const TEST_CLASS = 'Mustache';
protected $knownIssues = array(
'Delimiters' => "Known issue: sections don't respect delimiter changes",
// Just the whitespace ones...
);
/**
@@ -196,6 +196,30 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('Zappa, Frank', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa')));
}
/**
* @group interpolation
* @dataProvider interpolationData
*/
public function testDoubleRenderMustacheTags($template, $context, $expected) {
$m = new Mustache($template, $context);
$this->assertEquals($expected, $m->render());
}
public function interpolationData() {
return array(
array(
'{{#a}}{{=<% %>=}}{{b}} c<%={{ }}=%>{{/a}}',
array('a' => array(array('b' => 'Do Not Render'))),
'{{b}} c'
),
array(
'{{#a}}{{b}}{{/a}}',
array('a' => array('b' => '{{c}}'), 'c' => 'FAIL'),
'{{c}}'
),
);
}
/**
* Mustache should allow newlines (and other whitespace) in comments and all other tags.
*
@@ -378,6 +402,17 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('success', $m->render('{{=<% %>=}}<% result %>'));
}
/**
* @group delimiters
*/
public function testStickyDelimiters() {
$m = new Mustache(null, array('result' => 'FAIL'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}{{ result }}[[={{ }}=]]'));
$this->assertEquals('{{#result}}{{/result}}', $m->render('{{=[[ ]]=}}{{#result}}{{/result}}[[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]][[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{#result}}{{=[[ ]]=}}{{ result }}[[/result]][[^result]][[={{ }}=]][[ result ]]{{/result}}'));
}
/**
* @group sections
* @dataProvider poorlyNestedSections