- Changed template var from 'extend' to 'parent'

- README wrapped to 80 chars
- Added tests for pjaxtend usage

Author: alexhayes

README.rst

@@ -78,7 +78,9 @@ That's it!
 Using Template Extensions
 -------------------------
 
-If the content in your ``template-pjax.html`` file is very similar to your ``template.html`` an alternative method of operation is to use the decorator ``pjaxtend``, as follows::
+If the content in your ``template-pjax.html`` file is very similar to your 
+``template.html`` an alternative method of operation is to use the decorator 
+``pjaxtend``, as follows::
 
     from djpjax import pjaxtend
     
@@ -88,13 +90,15 @@ If the content in your ``template-pjax.html`` file is very similar to your ``tem
 
 Then, in your ``template.html`` file you can do the following::
 
-    {% extends extend %}
+    {% extends parent %}
     ...
     ...
 
-Note that the template will extend ``someapp/base.html`` unless its a pjax request in which case it will extend ``pjax.html``.
+Note that the template will extend ``someapp/base.html`` unless its a pjax request 
+in which case it will extend ``pjax.html``.
 
-If you want to define which template to extend for a pjax request you can do so as follows::
+If you want to define which template to extend for a pjax request you can do so 
+as follows::
  
     from djpjax import pjaxtend
     

djpjax.py

@@ -20,7 +20,7 @@ def _view(request, *args, **kwargs):
         return _view
     return pjax_decorator
 
-def pjaxtend(extend, pjax_extend='pjax.html'):
+def pjaxtend(parent, pjax_parent='pjax.html'):
     def pjaxtend_decorator(view):
         @functools.wraps(view)
         def _view(request, *args, **kwargs):
@@ -30,9 +30,9 @@ def _view(request, *args, **kwargs):
             #     warnings.warn("@pjax used with non-template-response view")
             #     return resp
             if request.META.get('HTTP_X_PJAX', False):
-                resp.context_data['extend'] = pjax_extend
-            elif extend:
-                resp.context_data['extend'] = extend
+                resp.context_data['parent'] = pjax_parent
+            elif parent:
+                resp.context_data['parent'] = parent
             return resp
         return _view
     return pjaxtend_decorator

tests.py

@@ -58,6 +58,23 @@ def test_class_with_pjax_template():
     resp = view(pjax_request)
     assert resp.template_name[0] == "pjax.html"
 
+def test_pjaxtend_default_parent():
+    resp = view_default_parent_pjaxtend(regular_request)
+    assert resp.template_name == "template.html"
+    assert resp.context_data['parent'] == "parent.html"
+    resp = view_default_parent_pjaxtend(pjax_request)
+    assert resp.template_name == "template.html"
+    assert resp.context_data['parent'] == "pjax.html"
+
+def test_pjaxtend_custom_parent():
+    resp = view_custom_parent_pjaxtend(regular_request)
+    assert resp.template_name == "template.html"
+    assert resp.context_data['parent'] == "parent.html"
+    resp = view_custom_parent_pjaxtend(pjax_request)
+    assert resp.template_name == "template.html"
+    assert resp.context_data['parent'] == "parent-pjax.html"
+
+
 # The test "views" themselves.
 
 @djpjax.pjax()
@@ -76,6 +93,14 @@ def view_with_pjax_template(request):
 def view_with_template_tuple(request):
     return TemplateResponse(request, ("template.html", "other_template.html"), {})
 
+@djpjax.pjaxtend('parent.html')
+def view_default_parent_pjaxtend(request):
+    return TemplateResponse(request, "template.html", {})
+
+@djpjax.pjaxtend('parent.html', 'parent-pjax.html')
+def view_custom_parent_pjaxtend(request):
+    return TemplateResponse(request, "template.html", {})
+
 class NoPJAXTemplateVew(djpjax.PJAXResponseMixin, View):
     template_name = 'template.html'