Merge pull request #244 from camilonova/patch-2

Recalculate content-length

pipeline/middleware.py

@@ -17,6 +17,7 @@ class MinifyHTMLMiddleware(object):
         if response.has_header('Content-Type') and 'text/html' in response['Content-Type']:
             try:
                 response.content = minify_html(response.content.strip())
+                response['Content-Length'] = str(len(response.content))
             except DjangoUnicodeDecodeError:
                 pass
         return response

tests/settings.py

@@ -13,6 +13,7 @@ SITE_ID = 1
 INSTALLED_APPS = [
     'django.contrib.contenttypes',
     'django.contrib.sites',
+    'django.contrib.sessions',
     'django.contrib.staticfiles',
     'django.contrib.auth',
     'django.contrib.admin',
@@ -20,6 +21,8 @@ INSTALLED_APPS = [
     'tests',
 ]
 
+ROOT_URLCONF = 'tests.urls'
+
 MEDIA_URL = '/media/'
 
 MEDIA_ROOT = local_path('media')

tests/tests/__init__.py

@@ -3,6 +3,7 @@ from .test_compiler import *
 from .test_compressor import *
 from .test_extension import *
 from .test_glob import *
+from .test_middleware import *
 from .test_packager import *
 from .test_storage import *
 from .test_utils import *

tests/tests/test_middleware.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.test import TestCase
+from django.conf import settings
+from django.core.urlresolvers import reverse
+
+
+class MiddlewareTest(TestCase):
+    def test_middleware_off(self):
+        response = self.client.get(reverse('admin:index'))
+
+        self.assertIn('text/html', response['Content-Type'])
+        # Should not come if not compressed
+        self.assertNotIn('Content-Length', response)
+
+    def test_middleware_on(self):
+        CUSTOM_MIDDLEWARE = (
+            'django.middleware.gzip.GZipMiddleware',
+            'pipeline.middleware.MinifyHTMLMiddleware',
+        ) + settings.MIDDLEWARE_CLASSES
+
+        with self.settings(MIDDLEWARE_CLASSES=CUSTOM_MIDDLEWARE):
+            response = self.client.get(reverse('admin:index'))
+
+            self.assertIn('text/html', response['Content-Type'])
+
+            length = str(len(response.content))
+            self.assertEqual(length, response['Content-Length'])

tests/urls.py

+from django.conf.urls import patterns, include
+from django.contrib import admin
+
+urlpatterns = patterns(
+    '',
+    (r'^admin/', include(admin.site.urls)),
+)