Merge 9ca0639 into 64e91c8

devproject/settings.py

@@ -178,6 +178,7 @@
     # Misago apps
     "misago.admin",
     "misago.acl",
+    "misago.analytics",
     "misago.cache",
     "misago.core",
     "misago.conf",

misago/analytics/tests/test_google_analytics_html.py

@@ -0,0 +1,15 @@
+from ...conf.test import override_dynamic_settings
+from ...test import assert_contains, assert_not_contains
+
+
+@override_dynamic_settings(google_tracking_id=None)
+def test_tracking_script_is_not_included_if_tracking_id_is_not_set(db, client):
+    response = client.get("/")
+    assert_not_contains(response, "googletagmanager.com/gtag/js")
+
+
+@override_dynamic_settings(google_tracking_id="UA-TEST")
+def test_tracking_script_is_included_if_tracking_id_is_not_set(db, client):
+    response = client.get("/")
+    assert_contains(response, "googletagmanager.com/gtag/js")
+    assert_contains(response, "UA-TEST")

misago/analytics/tests/test_google_verification_page.py

@@ -0,0 +1,40 @@
+from django.urls import reverse
+
+from ...conf.test import override_dynamic_settings
+from ...test import assert_contains
+
+
+@override_dynamic_settings(google_site_verification=None)
+def test_verification_page_returns_404_if_verification_token_is_not_set(db, client):
+    verification_link = reverse(
+        "misago:google-site-verification", kwargs={"token": "t0k3n"}
+    )
+    response = client.get(verification_link)
+    assert response.status_code == 404
+
+
+@override_dynamic_settings(google_site_verification="t0k3n")
+def test_verification_page_returns_404_if_verification_token_is_invalid(db, client):
+    verification_link = reverse(
+        "misago:google-site-verification", kwargs={"token": "inv4l1d"}
+    )
+    response = client.get(verification_link)
+    assert response.status_code == 404
+
+
+@override_dynamic_settings(google_site_verification="t0k3n")
+def test_verification_page_returns_200_if_verification_token_is_correct(db, client):
+    verification_link = reverse(
+        "misago:google-site-verification", kwargs={"token": "t0k3n"}
+    )
+    response = client.get(verification_link)
+    assert response.status_code == 200
+
+
+@override_dynamic_settings(google_site_verification="t0k3n")
+def test_verification_page_contains_token(db, client):
+    verification_link = reverse(
+        "misago:google-site-verification", kwargs={"token": "t0k3n"}
+    )
+    response = client.get(verification_link)
+    assert_contains(response, "googlet0k3n.html")

misago/analytics/urls.py

@@ -0,0 +1,11 @@
+from django.conf.urls import url
+
+from .views import google_site_verification
+
+urlpatterns = [
+    url(
+        r"^google(?P<token>[a-z0-9]+)\.html$",
+        google_site_verification,
+        name="google-site-verification",
+    )
+]

misago/analytics/views.py

@@ -0,0 +1,8 @@
+from django.http import Http404, HttpResponse
+
+
+def google_site_verification(request, token):
+    if token != request.settings.google_site_verification:
+        raise Http404()
+
+    return HttpResponse("google-site-verification: google%s.html" % token)

misago/conf/admin/__init__.py

@@ -3,6 +3,7 @@
 
 from .views import index
 from .views import (
+    ChangeAnalyticsSettingsView,
     ChangeCaptchaSettingsView,
     ChangeGeneralSettingsView,
     ChangeThreadsSettingsView,
@@ -16,6 +17,12 @@ def register_urlpatterns(self, urlpatterns):
 
         urlpatterns.patterns("settings", url(r"^$", index, name="index"))
 
+        urlpatterns.single_pattern(
+            r"^analytics/",
+            "analytics",
+            "settings",
+            ChangeAnalyticsSettingsView.as_view(),
+        )
         urlpatterns.single_pattern(
             r"^captcha/", "captcha", "settings", ChangeCaptchaSettingsView.as_view()
         )
@@ -61,10 +68,17 @@ def register_navigation_nodes(self, site):
             namespace="captcha",
             after="users:index",
         )
+        site.add_node(
+            name=_("Analytics"),
+            description=_("Enable Google Analytics or setup Google Site Verification."),
+            parent="settings",
+            namespace="analytics",
+            after="captcha:index",
+        )
         site.add_node(
             name=_("Threads"),
             description=_("Those settings control threads and posts."),
             parent="settings",
             namespace="threads",
-            after="captcha:index",
+            after="analytics:index",
         )