Merge branch 'clintonb-custom-request'

bakery/feeds.py

@@ -2,7 +2,6 @@
 import logging
 from django.conf import settings
 from bakery.views import BuildableMixin
-from django.test.client import RequestFactory
 from django.contrib.syndication.views import Feed
 logger = logging.getLogger(__name__)
 
@@ -22,7 +21,7 @@ def build_method(self):
 
     def build_queryset(self):
         logger.debug("Building %s" % self.build_path)
-        self.request = RequestFactory().get(self.build_path)
+        self.request = self.create_request(self.build_path)
         self.prep_directory(self.build_path)
         path = os.path.join(settings.BUILD_DIR, self.build_path)
         self.build_file(path, self.get_content())

bakery/views/base.py

@@ -20,6 +20,16 @@ class BuildableMixin(object):
     """
     Common methods we will use in buildable views.
     """
+    def create_request(self, path):
+        """
+        Returns a GET request object for use when building views.
+
+        If inheriting views require additional request attributes
+        (e.g. user, site), override this method and define those
+        attributes on the returned object.
+        """
+        return RequestFactory().get(path)
+
     def get_content(self):
         """
         How to render the HTML or other content for the page.
@@ -110,7 +120,7 @@ def build_method(self):
 
     def build(self):
         logger.debug("Building %s" % self.template_name)
-        self.request = RequestFactory().get(self.build_path)
+        self.request = self.create_request(self.build_path)
         path = os.path.join(settings.BUILD_DIR, self.build_path)
         self.prep_directory(self.build_path)
         self.build_file(path, self.get_content())
@@ -161,7 +171,7 @@ def build(self):
             self.build_path,
             self.get_redirect_url()
         ))
-        self.request = RequestFactory().get(self.build_path)
+        self.request = self.create_request(self.build_path)
         path = os.path.join(settings.BUILD_DIR, self.build_path)
         self.prep_directory(self.build_path)
         self.build_file(path, self.get_content())

bakery/views/dates.py

@@ -8,7 +8,6 @@
 from datetime import date
 from django.conf import settings
 from bakery.views import BuildableMixin
-from django.test.client import RequestFactory
 from django.views.generic.dates import (
     ArchiveIndexView,
     YearArchiveView,
@@ -48,7 +47,7 @@ def build_method(self):
 
     def build_queryset(self):
         logger.debug("Building %s" % self.build_path)
-        self.request = RequestFactory().get(self.build_path)
+        self.request = self.create_request(self.build_path)
         self.prep_directory(self.build_path)
         path = os.path.join(settings.BUILD_DIR, self.build_path)
         self.build_file(path, self.get_content())
@@ -105,7 +104,7 @@ def build_year(self, dt):
         """
         self.year = str(dt.year)
         logger.debug("Building %s" % self.year)
-        self.request = RequestFactory().get(self.get_url())
+        self.request = self.create_request(self.get_url())
         path = self.get_build_path()
         self.build_file(path, self.get_content())
 
@@ -189,7 +188,7 @@ def build_month(self, dt):
         self.month = str(dt.month)
         self.year = str(dt.year)
         logger.debug("Building %s-%s" % (self.year, self.month))
-        self.request = RequestFactory().get(self.get_url())
+        self.request = self.create_request(self.get_url())
         path = self.get_build_path()
         self.build_file(path, self.get_content())
 
@@ -288,7 +287,7 @@ def build_day(self, dt):
         self.year = str(dt.year)
         self.day = str(dt.day)
         logger.debug("Building %s-%s-%s" % (self.year, self.month, self.day))
-        self.request = RequestFactory().get(self.get_url())
+        self.request = self.create_request(self.get_url())
         path = self.get_build_path()
         self.build_file(path, self.get_content())
 

bakery/views/detail.py

@@ -8,7 +8,6 @@
 from .base import BuildableMixin
 from django.conf import settings
 from django.views.generic import DetailView
-from django.test.client import RequestFactory
 from django.core.exceptions import ImproperlyConfigured
 logger = logging.getLogger(__name__)
 
@@ -62,7 +61,7 @@ def set_kwargs(self, obj):
 
     def build_object(self, obj):
         logger.debug("Building %s" % obj)
-        self.request = RequestFactory().get(self.get_url(obj))
+        self.request = self.create_request(self.get_url(obj))
         self.set_kwargs(obj)
         path = self.get_build_path(obj)
         self.build_file(path, self.get_content())

bakery/views/list.py

@@ -7,7 +7,6 @@
 from .base import BuildableMixin
 from django.conf import settings
 from django.views.generic import ListView
-from django.test.client import RequestFactory
 logger = logging.getLogger(__name__)
 
 
@@ -39,7 +38,7 @@ def build_method(self):
 
     def build_queryset(self):
         logger.debug("Building %s" % self.build_path)
-        self.request = RequestFactory().get(self.build_path)
+        self.request = self.create_request(self.build_path)
         self.prep_directory(self.build_path)
         path = os.path.join(settings.BUILD_DIR, self.build_path)
         self.build_file(path, self.get_content())

setup.py

@@ -88,7 +88,7 @@ def run(self):
 
 setup(
     name='django-bakery',
-    version='0.8.11',
+    version='0.8.12',
     description='A set of helpers for baking your Django site out as flat files',
     author='The Los Angeles Times Data Desk',
     author_email='[email protected]',
@@ -111,10 +111,10 @@ def run(self):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: Implementation :: PyPy',
         'Framework :: Django',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'License :: OSI Approved :: MIT License',
     ],
     install_requires=[