Hopiu/django-analytical
1
0
Fork 0
mirror of https://github.com/jazzband/django-analytical.git synced 2026-03-16 22:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Clickmap id regular expression

Browse source
This commit is contained in:
Joost Cassee 2015-04-19 11:07:21 +02:00
parent 72b17165cb
commit e44141be80
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.rst
View file

@ -1,3 +1,7 @@
Development
-----------
* Fix Clickmap tracker id regular expression
Version 0.21.0
--------------
* Added compatibility with Python 3 (Eric Amador)

4
analytical/templatetags/clickmap.py
View file

@ -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}

8
analytical/tests/test_tag_clickmap.py
View file

@ -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)