Merge pull request #10 from spapas/master

Support Django 2.x and make tests pass

Author: spapas

.travis.yml

@@ -2,26 +2,23 @@ sudo: false
 language: python
 matrix:
   allow_failures:
-    - env: TOXENV=py27-djangomaster
-    - env: TOXENV=py34-djangomaster
 python:
-  - "3.4"
+  - "3.6"
 env:
   global:
     - PIP_DISABLE_PIP_VERSION_CHECK=true
   matrix:
-    - TOXENV=py27-django14
-    - TOXENV=py27-django15
-    - TOXENV=py27-django16
-    - TOXENV=py27-django17
     - TOXENV=py27-django18
-    - TOXENV=py27-djangomaster
+    - TOXENV=py27-django19
+    - TOXENV=py27-django110
+    - TOXENV=py27-django111
 
-    - TOXENV=py34-django15
-    - TOXENV=py34-django16
-    - TOXENV=py34-django17
-    - TOXENV=py34-django18
-    - TOXENV=py34-djangomaster
+    - TOXENV=py36-django18
+    - TOXENV=py36-django19
+    - TOXENV=py36-django110
+    - TOXENV=py36-django111
+    - TOXENV=py36-django20
+    - TOXENV=py36-django21
 
     - TOXENV=checkqa-python2
     - TOXENV=checkqa

README.rst

@@ -70,16 +70,15 @@ Requirements
 ------------
 
 - Python 2.7+ (Python 3 supported)
-- Django 1.4+
+- Django 1.8+
 
 Quick Install
 -------------
 
 - Install module: ``pip install django-rules-light``,
 - Add to ``settings.INSTALLED_APPS``: ``rules_light``,
-- Add in ``settings.MIDDLEWARE_CLASSES``: ``rules_light.middleware.Middleware``,
-- Add in ``urls.py``: ``rules_light.autodiscover()`` if you have
-  ``admin.autodiscover()`` in there too (Django < 1.7),
+- Add in ``settings.MIDDLEWARE_CLASSES`` (or ``settings.MIDDLEWARE`` for Django 1.10+): ``rules_light.middleware.Middleware``,
+
 
 You might want to read the `tutorial
 <https://django-rules-light.readthedocs.org/en/latest/tutorial.html>`_.

docs/source/tutorial.rst

@@ -18,7 +18,7 @@ Middleware
 ``````````
 
 To enable the middleware that processes ``rules_light.Denied``
-exception, add to ``setings.MIDDLEWARE_CLASSES``:
+exception, add to ``setings.MIDDLEWARE_CLASSES`` or ``settings.MIDDLEWARE`` for Django >= 1.10:
 
 .. code-block:: python
 
@@ -29,19 +29,6 @@ exception, add to ``setings.MIDDLEWARE_CLASSES``:
 
 See :doc:`docs on middleware</middleware>` for more details.
 
-Autodiscovery
-`````````````
-
-To enable autodiscovery of rules in the various apps installed
-in your project, add to ``urls.py`` (as early as possible):
-
-.. code-block:: python
-
-    import rules_light
-    rules_light.autodiscover()
-
-See :doc:`docs on registry</registry>` for more details.
-
 Logging
 ```````
 

rules_light/class_decorator.py

@@ -54,7 +54,9 @@ class class_decorator(object):
     - ``DetailView``, it will decorate ``get_object()``, to run
       ``rules_light.require('yourapp.yourmodel.read', obj)``,
     - others views, if the rule name is specified in the decorator for example
-      ``@class_decorator('some_rule')``, then it will decorate ``dispatch()``,
+      ``@class_decorator('some_rule')``, then it will decorate either
+      ``get_object()`` if the CBV is subclassed from ``SingleObjectMixin``
+      else it will decorate ``dispatch()``,
     - Else it raises an exception.
     """
     rule = None
@@ -119,13 +121,16 @@ def new_get_form(self, form_class, *args, **kwargs):
             patch_get_object(cls, 'delete', self.rule)
 
         elif self.rule:
-            old_dispatch = cls.dispatch
+            if issubclass(cls, generic.detail.SingleObjectMixin):
+                patch_get_object(cls, 'generic', self.rule)
+            else:
+                old_dispatch = cls.dispatch
 
-            def new_dispatch(self, request, *args, **kwargs):
-                registry.require(request.user, self.dispatch._rule)
-                return old_dispatch(self, request, *args, **kwargs)
-            new_dispatch._rule = self.rule
-            cls.dispatch = new_dispatch
+                def new_dispatch(self, request, *args, **kwargs):
+                    registry.require(request.user, self.dispatch._rule)
+                    return old_dispatch(self, request, *args, **kwargs)
+                new_dispatch._rule = self.rule
+                cls.dispatch = new_dispatch
 
         else:
             raise RulesLightException('Dont understand what to do')

rules_light/middleware.py

@@ -14,7 +14,7 @@
 class Middleware(object):
     """
     Install this middleware by adding `rules_light.middleware.Middleware`` to
-    ``settings.MIDDLEWARE_CLASSES``.
+    ``settings.MIDDLEWARE_CLASSES`` or ``settings.MIDDLEWARE`` for Django1.10+
     """
     def process_exception(self, request, exception):
         """
@@ -32,7 +32,7 @@ def process_exception(self, request, exception):
         return http.HttpResponseForbidden(template.loader.render_to_string(
             'rules_light/exception.html', ctx))
 
-    def __init__(self, get_response):
+    def __init__(self, get_response=None):
         super(Middleware, self).__init__()
         # Support Django 1.10 middleware.
         if get_response is not None:

rules_light/registry.py

@@ -146,7 +146,7 @@ def _autodiscover(registry):
         try:
             before_import_registry = copy.copy(registry)
             import_module('%s.rules_light_registry' % app)
-        except:
+        except Exception:
             # Reset the model registry to the state before the last import as
             # this import will have to reoccur on the next request and this
             # could raise NotRegistered and AlreadyRegistered exceptions

rules_light/shortcuts.py

@@ -69,4 +69,7 @@ def is_authenticated(user, rulename, *args, **kwargs):
     """
     Return user.is_authenticated().
     """
-    return user and user.is_authenticated()
+    try:
+        return user and user.is_authenticated()
+    except Exception:
+        return user and user.is_authenticated

rules_light/templatetags/rules_light_tags.py

@@ -32,7 +32,8 @@ class Rule(AsTag):
     )
 
     def get_value(self, context, rule_name, args, kwargs):
-        return rules_light.run(context['request'].user, rule_name, *args,
+        return rules_light.run(context.request.user, rule_name, *args,
                                **kwargs)
 
+
 register.tag(Rule)

rules_light/urls.py

@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import RegistryView
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'$', RegistryView.as_view(), name='rules_light_registry'),
-)
+]

test_project/test_project/settings.py

@@ -99,7 +99,7 @@
 #     'django.template.loaders.eggs.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -125,10 +125,10 @@
 if django.VERSION < (1, 8):
     TEMPLATE_CONTEXT_PROCESSORS = (
         'django.contrib.auth.context_processors.auth',
-        'django.core.context_processors.debug', 
+        'django.core.context_processors.debug',
         'django.core.context_processors.i18n',
         'django.core.context_processors.media',
-        'django.core.context_processors.static', 
+        'django.core.context_processors.static',
         'django.core.context_processors.tz',
         'django.contrib.messages.context_processors.messages'
     )