Merge pull request #1 from Erteno/asgi

Initial work for supporting ASGI. https://github.com/adamghill/django: Merged ASGI Branch until PR adamghill#121 is resolved
Erteno · Apr 8, 2021 · 423c972 · 423c972
2 parents c836bf1 + 24d7e0c
commit 423c972
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/django_unicorn/templates/unicorn/scripts.html b/django_unicorn/templates/unicorn/scripts.html
@@ -4,8 +4,13 @@
 <script src="{% static 'js/unicorn.min.js' %}"></script>
 
 <script>
+    {% if IS_ASGI %}
+    var url = "{% url 'django_unicorn:message_async' %}";
+    {% else %}
     var url = "{% url 'django_unicorn:message' %}";
+    {% endif %}
     Unicorn.init(url, "{{ CSRF_HEADER_NAME }}");
+
 </script>
 {% else %}
 <script type="module">
@@ -14,7 +19,11 @@
     // Set Unicorn to the global so it can be used by components
     window.Unicorn = Unicorn;
 
+    {% if IS_ASGI %}
+    var url = "{% url 'django_unicorn:message_async' %}";
+    {% else %}
     var url = "{% url 'django_unicorn:message' %}";
+    {% endif %}
     Unicorn.init(url, "{{ CSRF_HEADER_NAME }}");
 </script>
 {% endif %}
diff --git a/django_unicorn/templatetags/unicorn.py b/django_unicorn/templatetags/unicorn.py
@@ -25,6 +25,12 @@ def unicorn_scripts():
 
     return {
         "MINIFIED": get_setting("MINIFIED", not settings.DEBUG),
+        "IS_ASGI": hasattr(settings, "ASGI_APPLICATION")
+        and bool(settings.ASGI_APPLICATION)
+        and (
+            not hasattr(settings, "WSGI_APPLICATION")
+            or not bool(settings.WSGI_APPLICATION)
+        ),
         "CSRF_HEADER_NAME": csrf_header_name,
     }
 

diff --git a/django_unicorn/urls.py b/django_unicorn/urls.py
@@ -8,7 +8,12 @@
 
 urlpatterns = (
     re_path("message/(?P<component_name>[\w/\.-]+)", views.message, name="message"),
-    path(
-        "message", views.message, name="message"
-    ),  # Only here to build the correct url in scripts.html
+    re_path(
+        "message-async/(?P<component_name>[\w/\.-]+)",
+        views.message_async,
+        name="message_async",
+    ),
+    # Only here to build the correct url in scripts.html
+    path("message", views.message, name="message"),
+    path("message-async", views.message_async, name="message_async"),
 )
diff --git a/example/project/asgi.py b/example/project/asgi.py
@@ -0,0 +1,8 @@
+import os
+
+from django.core.asgi import get_asgi_application
+
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
+
+application = get_asgi_application()
diff --git a/example/project/settings.py b/example/project/settings.py
@@ -53,6 +53,9 @@
 ]
 
 WSGI_APPLICATION = "project.wsgi.application"
+ASGI_APPLICATION = (
+    "project.asgi.application"  # need to comment out WSGI_APPLICATION to enable ASGI
+)
 
 
 CACHES = {