Add support for partial blocks

pybars/_compiler.py

@@ -72,6 +72,7 @@
     | <expression>
     | <partial>
     | <rawblock>
+    | <partialblockrule>
 start ::= '{' '{'
 finish ::= '}' '}'
 comment ::= <start> '!' (~(<finish>) <anything>)* <finish> => ('comment', )
@@ -124,6 +125,9 @@
     | '.' => u''
 pathfinish :expected ::= <start> '/' <path>:found ?(found == expected) <finish>
 symbolfinish :expected ::= <start> '/' <symbol>:found ?(found == expected) <finish>
+partialfinish :expected ::= <start> '>' <partialname>:found ?(found == expected) <finish>
+partialblockrule ::= <start> '#' '>' <block_inner>:i
+      <template>:t <symbolfinish i[0]> => ('partialblock', u'"' + i[0] + u'"', i[1], t)
 blockrule ::= <start> '#' <block_inner>:i
       <template>:t <alttemplate>:alt_t <symbolfinish i[0]> => ('block',) + i + (t, alt_t)
     | <start> '^' <block_inner>:i
@@ -147,14 +151,16 @@
     | <invertedblock>
     | <rawblock>
     | <partial>
+    | <partialblock>
 block ::= [ "block" <anything>:symbol [<arg>*:arguments] [<compile>:t] [<compile>?:alt_t] ] => builder.add_block(symbol, arguments, t, alt_t)
+partialblock ::= [ "partialblock" <anything>:symbol [<arg>*:arguments] [<compile>:t] ] => builder.add_partial(symbol, arguments, t)
 comment ::= [ "comment" ]
 literal ::= [ ( "literal" | "newline" | "whitespace" ) :value ] => builder.add_literal(value)
 expand ::= [ "expand" <path>:value [<arg>*:arguments]] => builder.add_expand(value, arguments)
 escapedexpand ::= [ "escapedexpand" <path>:value [<arg>*:arguments]] => builder.add_escaped_expand(value, arguments)
 invertedblock ::= [ "invertedblock" <anything>:symbol [<arg>*:arguments] [<compile>:t] [<compile>?:alt_t] ] => builder.add_invertedblock(symbol, arguments, t, alt_t)
 rawblock ::= [ "rawblock" <anything>:symbol [<arg>*:arguments] <anything>:raw ] => builder.add_rawblock(symbol, arguments, raw)
-partial ::= ["partial" <complexarg>:symbol [<arg>*:arguments]] => builder.add_partial(symbol, arguments)
+partial ::= ["partial" <complexarg>:symbol [<arg>*:arguments]] => builder.add_partial(symbol, arguments, None)
 path ::= [ "path" [<pathseg>:segment]] => ("simple", segment)
  | [ "path" [<pathseg>+:segments] ] => ("complex", u"resolve(context, u'" + u"', u'".join(segments) + u"')" )
 complexarg ::= [ "path" [<pathseg>+:segments] ] => u"resolve(context, u'" + u"', u'".join(segments) + u"')"
@@ -732,7 +738,7 @@ def _invoke_template(self, fn_name, this_name):
             u", helpers=helpers, partials=partials, root=root))\n"
             ])
 
-    def add_partial(self, symbol, arguments):
+    def add_partial(self, symbol, arguments, nested):
         arg = ""
 
         overrides = None
@@ -758,14 +764,32 @@ def add_partial(self, symbol, arguments):
             overrides_literal += u'}'
         self._result.grow([u"    overrides = %s\n" % overrides_literal])
 
+        if nested is not None:
+            name = nested.name
+
+            self._locals[name] = nested
+            self._result.grow([
+                u"    partials['@partial-block'] = %s\n" % self._wrap_nested(name)
+
+            ])
+
+
         self._result.grow([
             u"    partialName = %s\n" % symbol,
-            u"    if partialName not in partials:\n",
+            u"    if partialName in partials:\n",
+            u"        inner = partials[partialName]\n",
+            u"    elif '@partial-block' in partials:\n",
+            u"        inner = partials['@partial-block']\n",
+            u"    else:\n",
             u"        raise PybarsError('The partial %s could not be found' % partialName)\n",
-            u"    inner = partials[partialName]\n",
             u"    scope = Scope(%s, context, root, overrides=overrides)\n" % self._lookup_arg(arg)])
         self._invoke_template("inner", "scope")
 
+        if nested is not None:
+            self._result.grow([
+                u"    del partials['@partial-block']\n"
+            ])
+
 
 class Compiler:
 

tests/test_acceptance.py

@@ -2747,3 +2747,39 @@ def test_template(self):
         text = u"Hola {{name}}!"
         context = {'name': u"Samira"}
         self.assertRender(text, context, u"Hola Samira!")
+
+    def test_partial_block_fallback(self):
+        template = u"Hello {{#> non_existent_partial}}World{{/non_existent_partial}}!"
+        context = {}
+        result = u"Hello World!"
+        self.assertRender(template, context, result)
+
+    def test_basic_partial_block(self):
+        partials = {
+            'name_partial': u"{{person.name}} and {{> @partial-block}}"
+        }
+
+        template = u"Hello {{#> name_partial person=person}}world{{/name_partial}}"
+        context = {
+            'person': {
+                'name': u"Samira"
+            }
+        }
+        result = u"Hello Samira and world"
+
+        self.assertRender(template, context, result, None, partials)
+
+    def test_partial_block_scoping(self):
+        partials = {
+            'name_partial': u"{{person.name}} and {{> @partial-block}}"
+        }
+
+        template = u"Hello {{#> name_partial person=person}}world{{/name_partial}}{{> @partial-block}}"
+        context = {
+            'person': {
+                'name': u"Samira"
+            }
+        }
+        result = u"Hello Samira and world"
+
+        self.assertRender(template, context, result, None, partials, "The partial @partial-block could not be found")