Merge pull request #5 from jtuulos/master

only show url path for page view events

jsapi/model.py

@@ -1,33 +1,18 @@
+from urlparse import urlparse
 from itertools import chain
 from bitdeli.model import model
 
-MAX_URL = 64
-
-# Customize to hide domain from page views
-# Example: "bitdeli.com"
-URL_DOMAIN = ""
+MAX_LEN = 64
 
 def event_names(events):
     for tstamp, group, ip, event in events:
-        name = event.get('$event_name', None)
+        name = event.get('$event_name')
         if name == '$dom_event':
-            name = event.get('$event_label', None)
+            name = event.get('$event_label')
         elif name == '$pageview':
-            if not event.get('$page', ''):
-                return
-            url = event['$page']
-            splitter = URL_DOMAIN if URL_DOMAIN else 'http://'
-            if splitter in url:
-                url = url.split(splitter, 1)[1]
-            url = ('...' + url[-MAX_URL:]) if len(url) > MAX_URL else url
-            name = 'Page: %s' % url
+            name = 'viewed %s' % urlparse(event.get('$page', '')).path
         if name:
-            yield name
-
-def get_names(events, name):
-    for tstamp, group, ip, event in events:
-        if name in event:
-            yield event[name]
+            yield name[:MAX_LEN].encode('utf-8')
 
 @model
 def build(profiles):