Merge branch 'minify-response'

Author: adamghill

conftest.py

@@ -32,6 +32,7 @@ def pytest_configure():
         "SERIAL": {"ENABLED": True, "TIMEOUT": 5},
         "CACHE_ALIAS": "default",
         "APPS": ("unicorn",),
+        "MINIFY_HTML": False,
     }
 
     caches = {

django_unicorn/components/unicorn_template_response.py

@@ -8,6 +8,7 @@
 from bs4.element import Tag
 from bs4.formatter import HTMLFormatter
 
+from django_unicorn.settings import get_minify_html_enabled
 from django_unicorn.utils import sanitize_html
 
 from ..decorators import timed
@@ -123,6 +124,15 @@ def render(self):
 
         response.content = rendered_template
 
+        if get_minify_html_enabled():
+            # Import here in case the minify extra was not installed
+            from htmlmin import minify
+
+            minified_html = minify(response.content.decode())
+
+            if len(minified_html) < len(rendered_template):
+                response.content = minified_html
+
         return response
 
     @staticmethod

django_unicorn/settings.py

@@ -1,6 +1,11 @@
+import logging
+
 from django.conf import settings
 
 
+logger = logging.getLogger(__name__)
+
+
 SETTINGS_KEY = "UNICORN"
 LEGACY_SETTINGS_KEY = f"DJANGO_{SETTINGS_KEY}"
 
@@ -53,3 +58,19 @@ def get_serial_timeout():
     Default serial timeout is 60 seconds.
     """
     return get_serial_settings().get("TIMEOUT", 60)
+
+
+def get_minify_html_enabled():
+    minify_html_enabled = get_setting("MINIFY_HTML", False)
+
+    if minify_html_enabled:
+        try:
+            import htmlmin
+        except ModuleNotFoundError:
+            logger.error(
+                "MINIFY_HTML is `True`, but minify extra could not be imported. Install with `unicorn[minify]`."
+            )
+
+            return False
+
+    return minify_html_enabled

django_unicorn/views/__init__.py

@@ -484,4 +484,4 @@ def message(request: HttpRequest, component_name: str = None) -> JsonResponse:
     component_request = ComponentRequest(request, component_name)
     json_result = _handle_component_request(request, component_request)
 
-    return JsonResponse(json_result)
+    return JsonResponse(json_result, json_dumps_params={"separators": (",", ":")})

noxfile.py

@@ -5,7 +5,7 @@
 @nox.parametrize("django", ["2.2", "3.0", "3.2"])
 def tests(session, django):
     session.install("poetry")
-    session.run("poetry", "install")
+    session.run("poetry", "install", "-E", "minify")
     session.install(f"django=={django}")
     session.run("pytest", "-m", "not slow")
     session.run("pytest", "-m", "slow")

poetry.lock

@@ -22,6 +22,10 @@ shortuuid = "^1.0.1"
 cachetools = "^4.1.1"
 dataclasses = {version = "^0.8.0", python = "<3.7"}
 decorator = "^4.4.2"
+htmlmin = { version = "^0.1.12", optional = true }
+
+[tool.poetry.extras]
+minify = ["htmlmin"]
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2"

pyproject.toml

@@ -244,6 +244,23 @@ def test_unicorn_render_component_one_script_tag(settings):
     assert len(re.findall('<script type="module"', html)) == 1
 
 
+def test_unicorn_render_component_minify_html(settings):
+    settings.DEBUG = True
+    settings.UNICORN["MINIFY_HTML"] = True
+    token = Token(
+        TokenType.TEXT,
+        "unicorn 'tests.templatetags.test_unicorn_render.FakeComponentKwargs'",
+    )
+    unicorn_node = unicorn(Parser([]), token)
+    context = {}
+    html = unicorn_node.render(Context(context))
+
+    assert "<script type=module" in html
+    assert len(re.findall("<script type=module", html)) == 1
+
+    settings.UNICORN["MINIFY_HTML"] = False
+
+
 def test_unicorn_render_child_component_no_script_tag(settings):
     settings.DEBUG = True
     token = Token(

tests/templatetags/test_unicorn_render.py

@@ -1,4 +1,8 @@
-from django_unicorn.settings import get_cache_alias, get_serial_enabled, get_settings
+from django_unicorn.settings import (
+    get_cache_alias,
+    get_minify_html_enabled,
+    get_serial_enabled,
+)
 
 
 def test_settings_cache_alias(settings):
@@ -32,3 +36,17 @@ def test_get_serial_enabled(settings):
     ] = "django.core.cache.backends.dummy.DummyCache"
     settings.UNICORN["CACHE_ALIAS"] = "unicorn_cache"
     assert get_serial_enabled() is False
+
+
+def test_settings_minify_html_false(settings):
+    settings.UNICORN["MINIFY_HTML"] = False
+
+    assert get_minify_html_enabled() is False
+
+
+def test_settings_minify_html_true(settings):
+    settings.UNICORN["MINIFY_HTML"] = True
+
+    assert get_minify_html_enabled() is True
+
+    settings.UNICORN["MINIFY_HTML"] = False