Ticket #15012: 15012.diff

django/middleware/cache.py

@@ -50 +50 @@
 
 from django.conf import settings
 from django.core.cache import get_cache, DEFAULT_CACHE_ALIAS
+from django.http import HttpResponse
 from django.utils.cache import get_cache_key, learn_cache_key, patch_response_headers, get_max_age
 
+def cache_templateresponse_cb(cache_obj, cache_key, timeout):
+    """Callback for TemplateResponse objects to cache a plain HttpResponse
+    object upon rendering."""
+    def __callback__(response):
+        plain_response = HttpResponse()
+        for attr in ['status_code', '_headers', '_charset', '_container',
+                     '_is_string', 'cookies']:
+            setattr(plain_response, attr, getattr(response, attr))
+        cache_obj.set(cache_key, plain_response, timeout)
+        return plain_response
+    return __callback__
+
 class UpdateCacheMiddleware(object):
     """
     Response-phase cache middleware that updates the cache if the response is
@@ -86 +99 @@
         patch_response_headers(response, timeout)
         if timeout:
             cache_key = learn_cache_key(request, response, timeout, self.key_prefix, cache=self.cache)
-            self.cache.set(cache_key, response, timeout)
+            if hasattr(response, 'render') and callable(response.render):
+                response.post_render_callback = cache_templateresponse_cb(
+                    self.cache, cache_key, timeout)
+            else:
+                self.cache.set(cache_key, response, timeout)
         return response
 
 class FetchFromCacheMiddleware(object):

django/template/response.py

@@ -65 +65 @@
         Returns the baked response instance.
         """
         if not self._is_rendered:
+            if callable(self.pre_render_callback):
+                self.pre_render_callback(self)
             self._set_content(self.rendered_content)
+            if callable(self.post_render_callback):
+                self.post_render_callback(self)
         return self
 
     is_rendered = property(lambda self: self._is_rendered)
 
+    pre_render_callback = None
+    post_render_callback = None
+
     def __iter__(self):
         if not self._is_rendered:
             raise ContentNotRenderedError('The response content must be rendered before it can be iterated over.')
@@ -109 +116 @@
             return context
         else:
             return RequestContext(self._request, context, current_app=self._current_app)
+
+    

tests/regressiontests/generic_views/base.py

@@ +1 @@
+import time
 import unittest
 
 from django.core.exceptions import ImproperlyConfigured
@@ -158 +159 @@
     def _assert_about(self, response):
         response.render()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '<h1>About</h1>')
+        self.assertContains(response, '<h1>About</h1>')
 
     def test_get(self):
         """
@@ -197 +198 @@
         self.assertEqual(response.context['params'], {'foo': 'bar'})
         self.assertEqual(response.context['key'], 'value')
 
+    def test_cached_views(self):
+        """
+        A template view can be cached
+        """
+        response = self.client.get('/template/cached/bar/')
+        self.assertEqual(response.status_code, 200)
+
+        time.sleep(0.2)
+
+        response2 = self.client.get('/template/cached/bar/')
+        self.assertEqual(response2.status_code, 200)
+
+        self.assertEqual(response.content, response2.content)
+
+        time.sleep(1.0)
+
+        # Let the cache expire and test again
+        response2 = self.client.get('/template/cached/bar/')
+        self.assertEqual(response2.status_code, 200)
+
+        self.assertNotEqual(response.content, response2.content)
+
 class RedirectViewTest(unittest.TestCase):
     rf = RequestFactory()
 

tests/regressiontests/generic_views/templates/generic_views/about.html

@@ -1 @@
-<h1>About</h1>
- No newline at end of file
+<h1>About</h1>
+{% now "U.u" %}

tests/regressiontests/generic_views/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
 from django.views.generic import TemplateView
+from django.views.decorators.cache import cache_page
 
 import views
 
@@ -15 +16 @@
     (r'^template/custom/(?P<foo>\w+)/$',
         views.CustomTemplateView.as_view(template_name='generic_views/about.html')),
 
+    (r'^template/cached/(?P<foo>\w+)/$',
+        cache_page(TemplateView.as_view(template_name='generic_views/about.html'), 1)),
+
     # DetailView
     (r'^detail/obj/$',
         views.ObjectDetail.as_view()),