add support for latest django

.gitignore

@@ -42,3 +42,4 @@ output/*/index.html
 docs/_build
 
 *.sqlite
+db.sqlite3

demo_app/demo_app/settings.py

@@ -0,0 +1,135 @@
+"""
+Django settings for demo_app project.
+
+Generated by 'django-admin startproject' using Django 1.11.2.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.11/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.11/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+def rel(*path):
+    return os.path.abspath(
+        os.path.join(os.path.dirname(__file__), *path)
+    ).replace("\\", "/")
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'uje_csnzoshw_459k37e24w&w@_7!-eq&)c77&8#7hrjrnv5vl'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+
+    "session_activity",
+    'simple_login'
+
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+    'session_activity.middleware.SessionActivityMiddleware',
+]
+
+ROOT_URLCONF = 'demo_app.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            'templates/'
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'demo_app.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.11/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+LOGIN_URL="/login/"
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.11/howto/static-files/
+
+STATIC_URL = '/static/'

demo_app/demo_app/urls.py

@@ -0,0 +1,11 @@
+from django.conf.urls import url, include
+from django.contrib import admin
+
+from session_activity import urls as session_urls
+from simple_login import views
+
+urlpatterns = [
+    url(r'^admin/', admin.site.urls),
+    url(r"^login/$", views.SimpleLogin.as_view()),
+    url(r"^", include(session_urls)),
+]

demo_app/demo_app/wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for demo_app project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo_app.settings")
+
+application = get_wsgi_application()

demo_app/manage.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    sys.path.append(os.path.abspath('..'))
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo_app.settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError:
+        # The above import may fail for some other reason. Ensure that the
+        # issue is really that Django is missing to avoid masking other
+        # exceptions on Python 2.
+        try:
+            import django
+        except ImportError:
+            raise ImportError(
+                "Couldn't import Django. Are you sure it's installed and "
+                "available on your PYTHONPATH environment variable? Did you "
+                "forget to activate a virtual environment?"
+            )
+        raise
+    execute_from_command_line(sys.argv)

demo_app/simple_login/views.py

@@ -0,0 +1,15 @@
+from django.contrib.auth.views import LoginView
+from django.core.management import call_command
+from django.contrib.auth.models import User
+
+
+class SimpleLogin(LoginView):
+    """
+    Login that ensures that user Admin with password pass is always created.
+    """
+
+    def __init__(self):
+        if not User.objects.filter(username="admin").exists():
+            User.objects.create_superuser("admin", "admin@test.com", "pass")
+
+        super(SimpleLogin, self).__init__()

demo_app/templates

@@ -0,0 +1 @@
+../tests/templates/

requirements.txt

@@ -1,3 +1,3 @@
-django>=1.8.0
+Django>=1.11.2
 django-appconf>=0.6
 python-dateutil

session_activity/middleware.py

@@ -1,12 +1,19 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
+from __future__ import absolute_import
 
 from .activity import update_current_session_info
 
 
 class SessionActivityMiddleware(object):
+    def __init__(self, get_response):
+        self.get_response = get_response
+        # One-time configuration and initialization.
+
+    def __call__(self, request):
+        # Code to be executed for each request before
+        # the view (and later middleware) are called.
+        response = self.get_response(request)
+
+        # Code to be executed for each request/response after
+        # the view is called.
+        return response
 
-    def process_request(self, request):
-        update_current_session_info(request)

session_activity/migrations/0001_initial.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-14 11:58
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SessionActivity',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('session_key', models.CharField(max_length=40, verbose_name='session key')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Session activity',
+                'verbose_name_plural': 'Session activity',
+            },
+        ),
+    ]

session_activity/models.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+1# -*- coding: utf-8 -*-
 
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)

session_activity/urls.py

@@ -1,12 +1,7 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
-from django.conf.urls import patterns, url
-
+from django.conf.urls import url
 from .views import session_list_view, sign_out_other_view
 
+
 urlpatterns = [
     url(r"^$", session_list_view, name="session_activity_list"),
     url(r"^sign-out-other/", sign_out_other_view, name="session_sign_out"),