Merge lp:~lifeless/pybars/bug-1040096 into lp:pybars

[Robert Collins]

handlebars.js comes with a default helperMissing, pybars doesn't, but should for compatability.

[James Westby (james-w)]

Hi,

Looks good.

Maybe a test for the helpers ordering change would be good?

Thanks,

James

review: Approve

[Robert Collins (lifeless)]

On Mon, Sep 24, 2012 at 12:45 PM, James Westby
<email address hidden> wrote:
> Review: Approve
>
> Hi,
>
> Looks good.
>
> Maybe a test for the helpers ordering change would be good?

Its covered already - I had to change it to keep tests passing :)

-Rob

=== modified file 'NEWS'
--- NEWS	2012-09-20 23:42:40 +0000
+++ NEWS	2012-09-23 08:15:25 +0000
@@ -6,6 +6,10 @@
 NEXT
 ----
 
+* A default `helperMissing` helper is now present in the global set of helpers.
+  This gives default behaviour the same as handlebars.js, though it can still
+  be overridden. (Robert Collins, lp:1040096)
+
 0.0.3
 -----
 
 
=== modified file 'pybars/_compiler.py'
--- pybars/_compiler.py	2012-09-20 23:42:40 +0000
+++ pybars/_compiler.py	2012-09-23 08:15:25 +0000
@@ -233,15 +233,23 @@
     return options['fn'](callwith)
 
 
+def _helperMissing(scope, name, *args):
+    if not args:
+        return None
+    raise Exception(u"Could not find property %s" % (name,))
+
+
 def _with(this, options, context):
     return options['fn'](context)
 
+
 # scope for the compiled code to reuse globals
 _pybars_ = {
     'helpers': {
         'blockHelperMissing': _blockHelperMissing,
         'each': _each,
         'if': _if,
+        'helperMissing': _helperMissing,
         'log': _log,
         'unless': _unless,
         'with': _with,
@@ -265,8 +273,9 @@
         # when profiling.
         self._result.grow(u"def render(context, helpers=None, partials=None):\n")
         self._result.grow(u"    result = strlist()\n")
-        self._result.grow(u"    if helpers is None: helpers = {}\n")
-        self._result.grow(u"    helpers.update(pybars['helpers'])\n")
+        self._result.grow(u"    _helpers = dict(pybars['helpers'])\n")
+        self._result.grow(u"    if helpers is not None: _helpers.update(helpers)\n")
+        self._result.grow(u"    helpers = _helpers\n")
         self._result.grow(u"    if partials is None: partials = {}\n")
         # Expose used functions and helpers to the template.
         self._locals['strlist'] = strlist
 
=== modified file 'pybars/tests/test_acceptance.py'
--- pybars/tests/test_acceptance.py	2012-09-20 23:42:40 +0000
+++ pybars/tests/test_acceptance.py	2012-09-23 08:15:25 +0000
@@ -547,6 +547,14 @@
         source = u"{{#truthy}}yep{{/truthy}}"
         self.assertEqual("yep", render(source, {'truthy': lambda this: True}))
 
+    def test_default_helperMissing_no_params(self):
+        source = u"a{{missing}}b"
+        self.assertEqual("ab", render(source, {}))
+
+    def test_default_helperMissing_with_param(self):
+        source = u"a{{missing something}}b"
+        self.assertRaises(Exception, render, source, {})
+
     def test_with(self):
         source = u"{{#with person}}{{first}} {{last}}{{/with}}"
         self.assertEqual("Alan Johnson",