django 1.9 fixes

.gitignore

@@ -0,0 +1,53 @@
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/

.landscape.yaml

@@ -0,0 +1,4 @@
+ignore-paths:
+  - south_migrations
+  - migrations
+  - example

LICENSE

@@ -1,4 +1,7 @@
-Copyright (c) 2008-2009 Josh VanderLinden
+The MIT License (MIT)
+
+Copyright (c) 2008-2015 Josh VanderLinden
+Copyright (c) 2015 Basil Shubin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,13 +10,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.rst

@@ -1,21 +1,34 @@
-``django-tracking`` is a simple attempt at keeping track of visitors to
-Django-powered Web sites.  It also offers basic blacklisting capabilities.
+``django-tracking`` is a simple attempt at keeping track of visitors
+to django-powered Web sites.  It also offers basic blacklisting
+capabilities.
 
-The offial repository for ``django-tracking`` is at
-http://bitbucket.org/codekoala/django-tracking.  Please file any tickets there.
+Authored by `Josh VanderLinden <http://www.codekoala.com//>`_, and some great
+`contributors <https://github.com/codekoala/django-tracking/contributors>`_.
+
+.. image:: https://img.shields.io/pypi/v/django-tracking.svg
+    :target: https://pypi.python.org/pypi/django-tracking/
+
+.. image:: https://img.shields.io/pypi/dm/django-tracking.svg
+    :target: https://pypi.python.org/pypi/django-tracking/
+
+.. image:: https://img.shields.io/github/license/bashu/django-tracking.svg
+    :target: https://pypi.python.org/pypi/django-tracking/
+
+.. image:: https://landscape.io/github/bashu/django-tracking/develop/landscape.svg?style=flat
+    :target: https://landscape.io/github/bashu/django-tracking/develop
 
 Features
-========
+--------
 
 * Tracks the following information about your visitors:
 
-    * Session key
-    * IP address
-    * User agent
-    * Whether or not they are a registered user and logged in
-    * Where they came from (http-referer)
-    * What page on your site they last visited
-    * How many pages on your site they have visited
+  * Session key
+  * IP address
+  * User agent
+  * Whether or not they are a registered user and logged in
+  * Where they came from (HTTP-REFERER)
+  * What page on your site they last visited
+  * How many pages on your site they have visited
 
 * Allows user-agent filtering for visitor tracking
 * Automatic clean-up of old visitor records
@@ -24,8 +37,8 @@ Features
 * The ability to have a live feed of active users on your website
 * Template tags to:
 
-    * display how many active users there are on your site
-    * determine how many active users are on the same page within your site
+  * display how many active users there are on your site
+  * determine how many active users are on the same page within your site
 
 * Optional "Active Visitors Map" to see where visitors are in the world
 
@@ -200,7 +213,7 @@ If you also want to show how many people are looking at the same page::
     {% visitors_on_page as same_page %}
     <p>
         {{ same_page }} of {{ visitors }} active user{{ visitors|pluralize }}
-        {{ same_page|pluralize:"is,are" }} reading this page
+        {% ifequal same_page 1 %}is{% else %}are{% endifequal %} reading this page
     </p>
 
 If you don't want particular areas of your site to be tracked, you may define a
@@ -223,5 +236,3 @@ default.  If you would like to override that setting, set
 ``TRACKING_CLEANUP_TIMEOUT`` to however many hours you want in your
 ``settings.py``.
 
-Good luck!  Please contact me with any questions or concerns you have with the
-project!

setup.py

@@ -1,23 +1,30 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
+import os
 from setuptools import setup, find_packages
-import sys, os
-import tracking
+
+README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
+
+# allow setup.py to be run from any path
+os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
+
+from tracking import __version__
 
 setup(
     name='django-tracking',
-    version=tracking.get_version(),
+    version=__version__,
+    packages=find_packages(exclude=['example']),
+    include_package_data=True,
+    license='MIT License',
     description="Basic visitor tracking and blacklisting for Django",
-    long_description=open('README.rst', 'r').read(),
+    long_description=README,
     keywords='django, tracking, visitors',
+    url='http://github.com/bashu/django-tracking/',
     author='Josh VanderLinden',
-    author_email='codekoala at gmail dot com',
-    url='http://bitbucket.org/codekoala/django-tracking',
-    license='MIT',
-    package_dir={'tracking': 'tracking'},
-    include_package_data=True,
-    packages=find_packages(),
+    author_email='codekoala@gmail.com',
+    maintainer='Basil Shubin',
+    maintainer_email='[email protected]',
+    install_requires=[
+        'django>=1.4',
+    ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
@@ -30,6 +37,7 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Topic :: Internet :: Log Analysis",
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Page Counters",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware",
         "Topic :: Security",

tracking/__init__.py

@@ -1,8 +1,4 @@
-import listeners
+VERSION = (0, 4, 2)
 
-VERSION = (0, 4, 0)
-
-def get_version():
-    "Returns the version as a human-format string."
-    return '.'.join([str(i) for i in VERSION])
+__version__ = '.'.join([str(n) for n in VERSION])
 

tracking/admin.py

@@ -1,5 +1,8 @@
 from django.contrib import admin
-from tracking.models import BannedIP, UntrackedUserAgent
+from tracking.models import Visitor, VisitorManager, BannedIP, UntrackedUserAgent
 
+class VisitorAdmin(admin.ModelAdmin):
+    search_fields = ['ip_address']
+admin.site.register(Visitor, VisitorAdmin)
 admin.site.register(BannedIP)
-admin.site.register(UntrackedUserAgent)
+admin.site.register(UntrackedUserAgent)

tracking/listeners.py

@@ -2,12 +2,21 @@
 
 log = logging.getLogger('tracking.listeners')
 
+importing_exceptions = (ImportError, )
+#Try to have the ImproperlyConfigured error available to catch that error during package installation
+#...looks like newer versions of Django might have broken only receiving an ImportError 
+try:
+    from django.core.exceptions import ImproperlyConfigured
+    importing_exceptions = (ImportError, ImproperlyConfigured)
+except ImportError: 
+    pass
+
 try:
     from django.core.cache import cache
     from django.db.models.signals import post_save, post_delete
 
     from tracking.models import UntrackedUserAgent, BannedIP
-except ImportError:
+except importing_exceptions:
     pass
 else:
 

tracking/middleware.py

@@ -1,4 +1,5 @@
-from datetime import datetime, timedelta
+from datetime import timedelta
+from django.utils import timezone
 import logging
 import re
 import traceback
@@ -7,15 +8,17 @@
 from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
 from django.core.urlresolvers import reverse, NoReverseMatch
-from django.db.utils import DatabaseError
+from django.db.utils import DatabaseError, IntegrityError
 from django.http import Http404
+from django.db import transaction
 
 from tracking import utils
 from tracking.models import Visitor, UntrackedUserAgent, BannedIP
 
 title_re = re.compile('<title>(.*?)</title>')
 log = logging.getLogger('tracking.middleware')
 
+
 class VisitorTrackingMiddleware(object):
     """
     Keeps track of your active users.  Anytime a visitor accesses a valid URL,
@@ -55,9 +58,6 @@ def prefixes(self):
         return self._prefixes
 
     def process_request(self, request):
-        # don't process AJAX requests
-        if request.is_ajax(): return
-
         # create some useful variables
         ip_address = utils.get_ip(request)
         user_agent = unicode(request.META.get('HTTP_USER_AGENT', '')[:255], errors='ignore')
@@ -77,13 +77,9 @@ def process_request(self, request):
                 log.debug('Not tracking UA "%s" because of keyword: %s' % (user_agent, ua.keyword))
                 return
 
-        if hasattr(request, 'session') and request.session.session_key:
-            # use the current session key if we can
-            session_key = request.session.session_key
-        else:
-            # otherwise just fake a session key
-            session_key = '%s:%s' % (ip_address, user_agent)
-            session_key = session_key[:40]
+        if not request.session.session_key:
+            request.session.save()
+        session_key = request.session.session_key
 
         # ensure that the request.path does not begin with any of the prefixes
         for prefix in self.prefixes:
@@ -93,7 +89,7 @@ def process_request(self, request):
 
         # if we get here, the URL needs to be tracked
         # determine what time it is
-        now = datetime.now()
+        now=timezone.localtime(timezone.now())
 
         attrs = {
             'session_key': session_key,
@@ -118,9 +114,9 @@ def process_request(self, request):
                 visitor.session_key = session_key
                 log.debug('Using existing visitor for IP %s / UA %s: %s' % (ip_address, user_agent, visitor.id))
             else:
-                # it's probably safe to assume that the visitor is brand new
-                visitor = Visitor(**attrs)
-                log.debug('Created a new visitor: %s' % attrs)
+                visitor, created = Visitor.objects.get_or_create(**attrs)
+                if created:
+                    log.debug('Created a new visitor: %s' % attrs)
         except:
             return
 
@@ -147,7 +143,11 @@ def process_request(self, request):
         visitor.page_views += 1
         visitor.last_update = now
         try:
+            sid = transaction.savepoint()
             visitor.save()
+            transaction.savepoint_commit(sid)
+        except IntegrityError:
+            transaction.savepoint_rollback(sid)
         except DatabaseError:
             log.error('There was a problem saving visitor information:\n%s\n\n%s' % (traceback.format_exc(), locals()))
 
@@ -159,7 +159,7 @@ def process_request(self, request):
 
         if str(timeout).isdigit():
             log.debug('Cleaning up visitors older than %s hours' % timeout)
-            timeout = datetime.now() - timedelta(hours=int(timeout))
+            timeout = timezone.localtime(timezone.now()) - timedelta(hours=int(timeout))
             Visitor.objects.filter(last_update__lte=timeout).delete()
 
 class BannedIPMiddleware: