From e44141be803a4a9b3adeaee9d61cea605d7cb245 Mon Sep 17 00:00:00 2001
From: Joost Cassee <joost@cassee.net>
Date: Sun, 19 Apr 2015 11:07:21 +0200
Subject: [PATCH] Update Clickmap id regular expression

---
 CHANGELOG.rst                         | 4 ++++
 analytical/templatetags/clickmap.py   | 4 ++--
 analytical/tests/test_tag_clickmap.py | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8a5c938..8cab77a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+Development
+-----------
+* Fix Clickmap tracker id regular expression
+
 Version 0.21.0
 --------------
 * Added compatibility with Python 3 (Eric Amador)
diff --git a/analytical/templatetags/clickmap.py b/analytical/templatetags/clickmap.py
index d0189d2..8d7f00f 100644
--- a/analytical/templatetags/clickmap.py
+++ b/analytical/templatetags/clickmap.py
@@ -11,7 +11,7 @@ from django.template import Library, Node, TemplateSyntaxError
 from analytical.utils import is_internal_ip, disable_html, get_required_setting
 
 
-CLICKMAP_TRACKER_ID_RE = re.compile(r'^\d+$')
+CLICKMAP_TRACKER_ID_RE = re.compile(r'^\w+$')
 TRACKING_CODE = """
     <script type="text/javascript">
     var clickmapConfig = {tracker: '%(tracker_id)s', version:'2'};
@@ -47,7 +47,7 @@ class ClickmapNode(Node):
     def __init__(self):
         self.tracker_id = get_required_setting('CLICKMAP_TRACKER_ID',
                                                CLICKMAP_TRACKER_ID_RE,
-                                               "must be a (string containing) a number")
+                                               "must be an alphanumeric string")
 
     def render(self, context):
         html = TRACKING_CODE % {'tracker_id': self.tracker_id}
diff --git a/analytical/tests/test_tag_clickmap.py b/analytical/tests/test_tag_clickmap.py
index 30375de..ed8656f 100644
--- a/analytical/tests/test_tag_clickmap.py
+++ b/analytical/tests/test_tag_clickmap.py
@@ -11,7 +11,7 @@ from analytical.tests.utils import TagTestCase
 from analytical.utils import AnalyticalException
 
 
-@override_settings(CLICKMAP_TRACKER_ID='12345')
+@override_settings(CLICKMAP_TRACKER_ID='12345ABC')
 class ClickmapTagTestCase(TagTestCase):
     """
     Tests for the ``clickmap`` template tag.
@@ -19,17 +19,17 @@ class ClickmapTagTestCase(TagTestCase):
 
     def test_tag(self):
         r = self.render_tag('clickmap', 'clickmap')
-        self.assertTrue("tracker: '12345', version:'2'};" in r, r)
+        self.assertTrue("tracker: '12345ABC', version:'2'};" in r, r)
 
     def test_node(self):
         r = ClickmapNode().render(Context({}))
-        self.assertTrue("tracker: '12345', version:'2'};" in r, r)
+        self.assertTrue("tracker: '12345ABC', version:'2'};" in r, r)
 
     @override_settings(CLICKMAP_TRACKER_ID=None)
     def test_no_site_id(self):
         self.assertRaises(AnalyticalException, ClickmapNode)
 
-    @override_settings(CLICKMAP_TRACKER_ID='abc')
+    @override_settings(CLICKMAP_TRACKER_ID='ab#c')
     def test_wrong_site_id(self):
         self.assertRaises(AnalyticalException, ClickmapNode)