From 7ef1c9fd3159fd8a50ce78a43f76e4e083e7e496 Mon Sep 17 00:00:00 2001
From: Garrett Robinson <garrett.f.robinson@gmail.com>
Date: Fri, 13 Jan 2017 12:25:30 -0800
Subject: [PATCH] Update Piwik tracking code

Updates Piwik TRACKING_CODE to be based on the latest tracking code from
https://developer.piwik.org/guides/tracking-javascript-guide.
---
 analytical/templatetags/piwik.py   |  8 +++++---
 analytical/tests/test_tag_piwik.py | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/analytical/templatetags/piwik.py b/analytical/templatetags/piwik.py
index 9713c72..15df433 100644
--- a/analytical/templatetags/piwik.py
+++ b/analytical/templatetags/piwik.py
@@ -21,19 +21,21 @@ DOMAINPATH_RE = re.compile(r'^(([^./?#@:]+\.)*[^./?#@:]+)+(:[0-9]+)?(/[^/?#@:]+)
 SITEID_RE = re.compile(r'^\d+$')
 
 TRACKING_CODE = """
+<!-- Piwik -->
 <script type="text/javascript">
   var _paq = _paq || [];
   %(variables)s
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://%(url)s/";
+    var u="//%(url)s/";
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', %(siteid)s]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
-    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
+<!-- End Piwik Code -->
 <noscript><p><img src="//%(url)s/piwik.php?idsite=%(siteid)s" style="border:0;" alt="" /></p></noscript>
 """  # noqa
 
diff --git a/analytical/tests/test_tag_piwik.py b/analytical/tests/test_tag_piwik.py
index 98bd269..b13b69f 100644
--- a/analytical/tests/test_tag_piwik.py
+++ b/analytical/tests/test_tag_piwik.py
@@ -20,14 +20,14 @@ class PiwikTagTestCase(TagTestCase):
 
     def test_tag(self):
         r = self.render_tag('piwik', 'piwik')
-        self.assertTrue(' ? "https" : "http") + "://example.com/";' in r, r)
+        self.assertTrue('"//example.com/"' in r, r)
         self.assertTrue("_paq.push(['setSiteId', 345]);" in r, r)
         self.assertTrue('img src="//example.com/piwik.php?idsite=345"'
                         in r, r)
 
     def test_node(self):
         r = PiwikNode().render(Context({}))
-        self.assertTrue(' ? "https" : "http") + "://example.com/";' in r, r)
+        self.assertTrue('"//example.com/";' in r, r)
         self.assertTrue("_paq.push(['setSiteId', 345]);" in r, r)
         self.assertTrue('img src="//example.com/piwik.php?idsite=345"'
                         in r, r)
@@ -36,21 +36,21 @@ class PiwikTagTestCase(TagTestCase):
                        PIWIK_SITE_ID='345')
     def test_domain_path_valid(self):
         r = self.render_tag('piwik', 'piwik')
-        self.assertTrue(' ? "https" : "http") + "://example.com/piwik/";' in r,
+        self.assertTrue('"//example.com/piwik/"' in r,
                         r)
 
     @override_settings(PIWIK_DOMAIN_PATH='example.com:1234',
                        PIWIK_SITE_ID='345')
     def test_domain_port_valid(self):
         r = self.render_tag('piwik', 'piwik')
-        self.assertTrue(' ? "https" : "http") + "://example.com:1234/";' in r,
+        self.assertTrue('"//example.com:1234/";' in r,
                         r)
 
     @override_settings(PIWIK_DOMAIN_PATH='example.com:1234/piwik',
                        PIWIK_SITE_ID='345')
     def test_domain_port_path_valid(self):
         r = self.render_tag('piwik', 'piwik')
-        self.assertTrue(' ? "https" : "http") + "://example.com:1234/piwik/";' in r,
+        self.assertTrue('"//example.com:1234/piwik/"' in r,
                         r)
 
     @override_settings(PIWIK_DOMAIN_PATH=None)