From a834ef7845e8afc3e65165b2e36648c218ee1493 Mon Sep 17 00:00:00 2001 From: Justin Hileman Date: Fri, 30 Apr 2010 00:09:27 -0400 Subject: [PATCH] Added unescaped pragma. --- Mustache.php | 27 ++++++++++++++++--- examples/pragma_unescaped/PragmaUnescaped.php | 5 ++++ .../pragma_unescaped.mustache | 3 +++ .../pragma_unescaped/pragma_unescaped.txt | 2 ++ test/MustachePragmaUnescapedTest.php | 15 +++++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 examples/pragma_unescaped/PragmaUnescaped.php create mode 100644 examples/pragma_unescaped/pragma_unescaped.mustache create mode 100644 examples/pragma_unescaped/pragma_unescaped.txt create mode 100644 test/MustachePragmaUnescapedTest.php diff --git a/Mustache.php b/Mustache.php index e47e532..8e87331 100644 --- a/Mustache.php +++ b/Mustache.php @@ -27,6 +27,18 @@ class Mustache { const PRAGMA_DOT_NOTATION = 'DOT-NOTATION'; + /** + * The {{%UNESCAPED}} pragma swaps the meaning of the {{normal}} and {{{unescaped}}} + * Mustache tags. That is, once this pragma is activated the {{normal}} tag will not be + * escaped while the {{{unescaped}}} tag will be escaped. + * + * Pragmas apply only to the current template. Partials, even those included after the + * {{%UNESCAPED}} call, will need their own pragma declaration. + * + * his may be useful in non-HTML Mustache situations. + */ + const PRAGMA_UNESCAPED = 'UNESCAPED'; + protected $tagRegEx; protected $template = ''; @@ -35,7 +47,8 @@ class Mustache { protected $pragmas = array(); protected $pragmasImplemented = array( - self::PRAGMA_DOT_NOTATION + self::PRAGMA_DOT_NOTATION, + self::PRAGMA_UNESCAPED ); /** @@ -310,11 +323,19 @@ class Mustache { break; case '{': case '&': - return $this->renderUnescaped($tag_name, $context); + if ($this->hasPragma(self::PRAGMA_UNESCAPED)) { + return $this->renderEscaped($tag_name, $context); + } else { + return $this->renderUnescaped($tag_name, $context); + } break; case '': default: - return $this->renderEscaped($tag_name, $context); + if ($this->hasPragma(self::PRAGMA_UNESCAPED)) { + return $this->renderUnescaped($tag_name, $context); + } else { + return $this->renderEscaped($tag_name, $context); + } break; } } diff --git a/examples/pragma_unescaped/PragmaUnescaped.php b/examples/pragma_unescaped/PragmaUnescaped.php new file mode 100644 index 0000000..59681a8 --- /dev/null +++ b/examples/pragma_unescaped/PragmaUnescaped.php @@ -0,0 +1,5 @@ + Shark'; +} \ No newline at end of file diff --git a/examples/pragma_unescaped/pragma_unescaped.mustache b/examples/pragma_unescaped/pragma_unescaped.mustache new file mode 100644 index 0000000..76095d7 --- /dev/null +++ b/examples/pragma_unescaped/pragma_unescaped.mustache @@ -0,0 +1,3 @@ +{{%UNESCAPED}} +{{vs}} +{{{vs}}} \ No newline at end of file diff --git a/examples/pragma_unescaped/pragma_unescaped.txt b/examples/pragma_unescaped/pragma_unescaped.txt new file mode 100644 index 0000000..2860f61 --- /dev/null +++ b/examples/pragma_unescaped/pragma_unescaped.txt @@ -0,0 +1,2 @@ +Bear > Shark +Bear > Shark \ No newline at end of file diff --git a/test/MustachePragmaUnescapedTest.php b/test/MustachePragmaUnescapedTest.php new file mode 100644 index 0000000..559eeab --- /dev/null +++ b/test/MustachePragmaUnescapedTest.php @@ -0,0 +1,15 @@ + 'Bear > Shark')); + + $this->assertEquals('Bear > Shark', $m->render('{{%UNESCAPED}}{{title}}')); + $this->assertEquals('Bear > Shark', $m->render('{{%UNESCAPED}}{{{title}}}')); + } + +} \ No newline at end of file