Merge lp:~bloodearnest/django-preflight/gargoyle into lp:~canonical-isd-hackers/django-preflight/gargoyle

[Simon Davy]

Add support for showing switches. Initially just gargoyle.

Unmerged revisions

26. By Simon Davy on 2013-05-31

more generic (less gargoyle specific), more gargoyle tests, embedded json switch data for automated scraping

25. By Simon Davy on 2013-05-31

Merge mfoord's branch into trunk, and make gargoyle optional in the process

24. By Łukasz Czyżykowski on 2013-05-23

[r=ricardokirkner] Updated code and tests to work with Django 1.5; dropped support for Python 2.5

23. By Anthony Lenton on 2013-02-20

[r=james-w] Fixed a silly bug that meant that hidden settings weren't really configurable via the PREFLIGHT_HIDDEN_SETTINGS setting.

22. By Łukasz Czyżykowski on 2012-10-03

Updated debian/rules to be compatible with precise.

21. By Łukasz Czyżykowski on 2012-10-03

Added entry in the changelog

20. By Łukasz Czyżykowski on 2012-10-02

Merged the 1.4-release branch

19. By Anthony Lenton on 2012-09-24

[r=lukasz-czyzykowski] Added configurable hidden settings.

18. By Māris Fogels on 2012-08-03

[r=lukasz-czyzykowski] Changed the default display template to the Django admin theme.

17. By Jonathan Lange on 2012-08-03

[r=lukasz-czyzykowski] Add platform to default versions

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2013-05-31 15:53:26 +0000
@@ -0,0 +1,1 @@
+include preflight/templates/preflight/*.html
 \ No newline at end of file
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-10-04 14:33:24 +0000
+++ debian/changelog	2013-05-31 15:53:26 +0000
@@ -1,3 +1,12 @@
+django-preflight (0.1.4) precise; urgency=low
+
+  * Added display of settings on the preflight page
+  * Added configurable list of settings to hide
+  * Changed default base tamplate to Django admin base
+  * Added platform to default versions
+
+ -- Łukasz Czyżykowski <[e-mail]>  Wed, 03 Oct 2012 09:45:22 +0000
+
 django-preflight (0.1.1) lucid; urgency=low
 
   * Use RequestContext instance when rendering the overview view
 
=== modified file 'debian/rules'
--- debian/rules	2011-02-07 16:06:51 +0000
+++ debian/rules	2013-05-31 15:53:26 +0000
@@ -4,4 +4,3 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/langpack.mk
 
=== modified file 'doc/conf.py'
--- doc/conf.py	2011-02-09 16:26:04 +0000
+++ doc/conf.py	2013-05-31 15:53:26 +0000
@@ -18,7 +18,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.append(os.path.abspath('..'))
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'preflight_example_project.settings'
 
 # -- General configuration -----------------------------------------------------
 
 
=== modified file 'doc/install.rst'
--- doc/install.rst	2012-05-25 16:34:25 +0000
+++ doc/install.rst	2013-05-31 15:53:26 +0000
@@ -38,19 +38,21 @@
 
 django-preflight by itself doesn't have any extra dependecies.
 
-Because this project doesn't include any database models, there's no
-need of updating your database schema.
+Because this project doesn't include any models, there's no need of
+updating your database schema.
 
 
 Update ``urls.py``
 ------------------
 
-Last bit of configuration is to include django-preflight into the
-project's ``urls.py`` file. It should look like the following:
+Last bit of configuration is to run preflight discovery code and to
+include it somewhere in the url's definition. The easiest way for
+doing both of those steps is to modify project's ``urls.py`` file. It
+should look like the following:
 
 .. testcode::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls import *
 
     import preflight
     import preflight.urls
@@ -78,10 +80,12 @@
 Compatibility
 -------------
 
-django-preflight is tested with released Django versions from
-1.1 to 1.4. To be sure about this it's tested
-with tox_ against all of these versions.
+django-preflight is compatible with released Django versions since
+1.1, up to current 1.5. To be sure about this it's tested using tox_
+against all of them.
 
-Additionally it's tested on Python 2.5, 2.6 and 2.7, all on Ubuntu Linux.
+Additionally it's tested on Python 2.6 and 2.7, all of that on `Ubuntu
+Linux`_.
 
 .. _tox: http://codespeak.net/tox/
+   _Ubuntu Linux: http://www.ubuntu.com
 
=== removed directory 'example_project'
=== removed file 'example_project/__init__.py'
=== removed directory 'example_project/app'
=== removed file 'example_project/app/__init__.py'
=== removed file 'example_project/app/models.py'
=== removed file 'example_project/app/preflight.py'
--- example_project/app/preflight.py	2011-02-07 16:06:51 +0000
+++ example_project/app/preflight.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from __future__ import absolute_import
-
-from django.conf import settings
-
-import os.path
-import preflight
-import tempfile
-
-
-class AppPreflight(preflight.Preflight):
-
-    def authenticate(self, request):
-        # Allow everybody to access this page. Default implementation restricts
-        # this to people who can access /admin/ pages (user.is_stuff == True).
-        return True
-
-    def versions(self):
-        return [{'name': 'foo-bar', 'version': '1.2.3'}]
-
-    def check_media_root_is_writable(self):
-        """Check if current MEDIA_ROOT directory is writable."""
-        path = os.path.realpath(settings.MEDIA_ROOT)
-
-        # Try writing to temporary file in MEDIA_ROOT
-        tmp = tempfile.TemporaryFile(dir=path)
-        tmp.write("test")
-        tmp.close()
-
-        # If we reached this point this means the directory itself is
-        # writable. In case of any errors an exception would cause the check to
-        # fail. Return value informs preflight that everything went right.
-        return True
-
-
-preflight.register(AppPreflight)
 
=== removed directory 'example_project/app/templates'
=== removed file 'example_project/app/templates/base.html'
--- example_project/app/templates/base.html	2011-02-07 16:06:51 +0000
+++ example_project/app/templates/base.html	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-{# Copyright 2010 Canonical Ltd.  This software is licensed under the  #}
-{# GNU Affero General Public License version 3 (see the file LICENSE). #}
-<html>
-  <head>
-    <title>{% block title %}{% endblock %}</title>
-    <style>
-      #content { 
-        font: 13.34px helvetica, arial, freesans, clean, sans-serif;
-        width: 600px;
-        margin: 32px auto;
-        border: 1px solid #ddd;
-        padding: 2em;
-        background-color: #f0f0f0;
-      }
-      #content p {
-        margin-top: 32px;
-        border-top: 1px solid #999;
-        text-align: center;
-      }
-      #content h1 {
-        margin: 64px 0 32px;
-        border-bottom: 3px solid #555;
-      }
-      #content h2 {
-        margin: 32px 0;
-        border-bottom: 3px solid #999;
-      }
-      #content table {
-        padding: 0;
-        border-spacing: 0;
-        width: 100%;
-      }
-      #content table th {
-        border-bottom: 1px solid #aaa;
-      }
-      #content table td,
-      #content table th {
-        padding: 0.3em;
-      }
-      #content .ok {
-        color: green;
-      }
-      #content .error {
-        color: red;
-      }
-      #content td.status {
-        text-align: center;
-      }
-      #content td.description {
-        font-size: 80%;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="content">{% block content %}{% endblock %}</div>
-  </body>
-</html>
 
=== removed file 'example_project/manage.py'
--- example_project/manage.py	2011-02-07 16:06:51 +0000
+++ example_project/manage.py	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-import sys
-sys.path.append('..')
-
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)
 
=== removed file 'example_project/run.py'
--- example_project/run.py	2011-02-07 16:06:51 +0000
+++ example_project/run.py	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-import os
-import sys
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings'
-sys.path.insert(0, 'example_project')
-
-try:
-    from django.test.utils import get_runner
-except ImportError:
-    from django.test.simple import run_tests
-    get_runner = lambda s: run_tests
-
-from django.conf import settings
-
-
-
-def tests():
-    TestRunner = get_runner(settings)
-    if hasattr(TestRunner, 'func_name'):
-        # Before change in Django 1.2
-        failures = TestRunner(['preflight'])
-    else:
-        test_runner = TestRunner()
-        failures = test_runner.run_tests(['preflight'])
-
-    sys.exit(bool(failures))
-
-
-
-if __name__ == '__main__':
-    tests()
 
=== removed file 'example_project/settings.py'
--- example_project/settings.py	2012-05-25 16:31:15 +0000
+++ example_project/settings.py	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-import os
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = ()
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'database.sqlit3',
-    }
-}
-
-# Old db setup
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = 'database.sqlite3'
-
-TIME_ZONE = 'America/Chicago'
-LANGUAGE_CODE = 'en-us'
-SITE_ID = 1
-MEDIA_ROOT = ''
-MEDIA_URL = ''
-ADMIN_MEDIA_PREFIX = '/media/'
-SECRET_KEY = 'j0-wo!y4zwi)tejv1u(0skc41_379ls^@qbh91%#5o=greje6('
-
-ROOT_URLCONF = 'example_project.urls'
-
-TEMPLATE_DIRS = (
-    os.path.join(os.path.realpath(os.path.dirname(__file__)), 'templates'),
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'preflight',
-    'app',
-    'gargoyle',
-)
-
-PREFLIGHT_BASE_TEMPLATE = 'base.html'
 
=== removed file 'example_project/urls.py'
--- example_project/urls.py	2011-10-04 15:54:50 +0000
+++ example_project/urls.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from django.conf.urls.defaults import (
-    handler404, handler500, include, patterns
-)
-
-import preflight
-
-
-preflight.autodiscover()
-
-urlpatterns = patterns('',
-    (r'^preflight/', include('preflight.urls')),
-)
 
=== modified file 'preflight/__init__.py'
--- preflight/__init__.py	2011-03-19 15:15:41 +0000
+++ preflight/__init__.py	2013-05-31 15:53:26 +0000
@@ -5,7 +5,7 @@
 
 from .models import REGISTRY
 
-__version__ = "0.1.1"
+__version__ = "0.1.5"
 
 
 def autodiscover():
 
=== added file 'preflight/conf.py'
--- preflight/conf.py	1970-01-01 00:00:00 +0000
+++ preflight/conf.py	2013-05-31 15:53:26 +0000
@@ -0,0 +1,6 @@
+from django.conf import settings
+
+
+BASE_TEMPLATE = getattr(
+    settings, 'PREFLIGHT_BASE_TEMPLATE', "admin/base.html")
+TABLE_CLASS = getattr(settings, 'PREFLIGHT_TABLE_CLASS', "listing")
 
=== modified file 'preflight/models.py'
--- preflight/models.py	2012-05-25 16:31:15 +0000
+++ preflight/models.py	2013-05-31 15:53:26 +0000
@@ -2,6 +2,8 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from __future__ import absolute_import
+
+import re
 from django.conf import settings
 from django.views.debug import HIDDEN_SETTINGS
 
@@ -75,11 +77,13 @@
     data.
 
     """
+    import platform
     import sys
     import django
     import preflight
 
     items = [
+        {'name': 'Platform', 'version': platform.platform()},
         {'name': 'Django', 'version': django.get_version()},
         {'name': 'Python', 'version': sys.version},
         {'name': 'preflight', 'version': preflight.__version__}
@@ -115,8 +119,13 @@
     names = sorted([x for x in settings._wrapped.__dict__
         if x.isupper() and not x.startswith('_')])
     settings_list = []
+    hidden_settings = getattr(settings, 'PREFLIGHT_HIDDEN_SETTINGS', None)
+    if hidden_settings:
+        hidden_settings = re.compile(hidden_settings)
+    else:
+        hidden_settings = HIDDEN_SETTINGS
     for name in names:
-        if HIDDEN_SETTINGS.match(name):
+        if hidden_settings.search(name):
             value = '******************'
         else:
             value = getattr(settings, name, None)
@@ -135,16 +144,40 @@
     return all(class_().authenticate(request) for class_ in REGISTRY)
 
 
+def gather_switches():
+    """Gather all switches into one list."""
+    switches = {}
+    if settings.USE_GARGOYLE:
+        gargoyle_switches = gather_gargoyle()
+        if gargoyle_switches:
+            switches['gargoyle'] = gargoyle_switches
+    return switches
+
+
 def gather_gargoyle():
+    if not settings.USE_GARGOYLE:
+        return None
     try:
         from gargoyle.models import Switch
     except ImportError:
         return None
-    switches = Switch.objects.all()
-    return [_format_switch(switch) for switch in switches]
-
-def _format_switch(switch):
+    return [_format_gargoyle(switch) for switch in Switch.objects.all()]
+
+
+def _format_gargoyle(switch):
+    from gargoyle import gargoyle
+    """Formats a gargoyle switch into std format for display"""
+    d = switch.to_dict(gargoyle)
+    conditions = []
+    for condition in d['conditions']:
+        params = ','.join('%s=%s' % (c[0], c[2])
+                          for c in condition['conditions'])
+        conditions.append("%s(%s)" % (condition['label'], params))
+
     return dict(
-        name=switch.key, description=switch.description or '',
-        value=switch.value, status=switch.get_status_label()
-    )
 \ No newline at end of file
+        name=d['key'],
+        description=d['description'],
+        status=d['status'],
+        status_text=d['statusLabel'],
+        conditions=conditions,
+    )
 
=== modified file 'preflight/templates/preflight/overview.html'
--- preflight/templates/preflight/overview.html	2012-05-25 16:31:15 +0000
+++ preflight/templates/preflight/overview.html	2013-05-31 15:53:26 +0000
@@ -17,7 +17,9 @@
     {% endfor %}
     <li><a href="#versions">Versions</a></li>
     <li><a href="#settings">Settings</a></li>
-    <li><a href="#gargoyle">Gargoyle</a></li>
+    {% if switches %}
+    <li><a href="#switches">Switches</a></li>
+    {% endif %}
   </ul>
 
   {% for application in applications %}
@@ -81,32 +83,48 @@
   {% endfor %}
   </dl>
 
+  {% if switches %}
   <a href="#links" style="text-decoration : none;">
-    <h1 id="gargoyle">{% trans "Gargoyle Switches" %}</h1>
+    <h1 id="switches">{% trans "Switches" %}</h1>
   </a>
-  {% if gargoyle %}
-    <table id="gargoyle-table" class="{{ preflight_table_class }}">
+    <table id="switches-table" class="{{ preflight_table_class }}">
       <thead>
         <tr>
           <th>{% trans "Name" %}</th>
           <th>{% trans "Description" %}</th>
-          <th>{% trans "value" %}</th>
+          <th>{% trans "Conditions" %}</th>
           <th>{% trans "Status" %}</th>
         </tr>
       </thead>
       <tbody>
-        {% for item in gargoyle %}
-          <tr>
-            <td>{{ item.name }}</td>
-            <td>{{ item.description }}</td>
-            <td>{{ item.value }}</td>
-            <td>{{ item.status }}</td>
-          </tr>
+        {% for type, type_switches in switches.items %}
+        <tr><th colspan="4">{{ type }}</th></tr>
+        {% for switch in type_switches %}
+        <tr class="switch">
+            <td>{{ switch.name }}</td>
+            <td>{{ switch.description }}</td>
+            <td>
+                {% if switch.conditions %}
+                <ul>
+                    {% for condition in switch.conditions  %}
+                    <li>{{ condition|first }}: {{ condition|last }}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+            </td>
+            <td>{{ switch.status_text }}</td>
+        {% endfor %}
+        </tr>
         {% endfor %}
       </tbody>
-    </table>
+  </table>
+  <p>Switch data is included in JSON format in a script tag with id
+      "switches-json" to aid automated scripting</p>
+  <script id="switches-json">
+    {{ switches_json|safe }}
+  </script>
   {% else %}
-    <p>No gargoyle switches.</p>
+    <p>No switches.</p>
   {% endif %}
 </div>
 
 
=== modified file 'preflight/tests.py'
--- preflight/tests.py	2012-05-25 17:19:29 +0000
+++ preflight/tests.py	2013-05-31 15:53:26 +0000
@@ -1,19 +1,26 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 import sys
+import json
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf  # NOQA
 
+from django.conf import settings
 from django.core.management import call_command
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse
 from django.test import TestCase
-from django.template import RequestContext, TemplateDoesNotExist
-
+from django.template import RequestContext
+from django.template.loader import render_to_string
 from mock import (
     Mock,
     patch,
 )
 
 from cStringIO import StringIO
+from pyquery import PyQuery
 
 from . import Preflight
 from .models import (
@@ -22,11 +29,12 @@
     REGISTRY,
     authenticate,
     gather_checks,
+    gather_switches,
     gather_gargoyle,
     gather_settings,
     gather_versions,
 )
-
+from preflight.conf import BASE_TEMPLATE, TABLE_CLASS
 
 
 class CheckTestCase(TestCase):
@@ -48,7 +56,8 @@
         self.assertEquals(check.description, "description")
 
     def test_initialisation_when_doc_is_none(self):
-        def method(): pass
+        def method():
+            pass
 
         check = Check("check_name", method)
 
@@ -144,6 +153,7 @@
     def authenticate(self, request):
         return False
 
+
 def clear_registry():
     while REGISTRY:
         REGISTRY.pop()
@@ -184,6 +194,7 @@
     def versions(self):
         return [{'name': 'spam', 'version': 'ni'}]
 
+
 class ExtraVersionAsList(Preflight):
 
     versions = [{'name': 'eggs', 'version': 'peng'}]
@@ -196,7 +207,7 @@
 
         versions = gather_versions()
 
-        self.assertEquals(len(versions), 3)
+        self.assertEquals(len(versions), 4)
         for item in versions:
             self.assertTrue('name' in item and 'version' in item)
 
@@ -206,7 +217,7 @@
 
         versions = gather_versions()
 
-        self.assertEquals(len(versions), 4)
+        self.assertEquals(len(versions), 5)
         self.assertEquals(versions[-1]['name'], 'spam')
 
     def test_get_extra_version_information_from_class_attribute(self):
@@ -215,7 +226,7 @@
 
         versions = gather_versions()
 
-        self.assertEquals(len(versions), 4)
+        self.assertEquals(len(versions), 5)
         self.assertEquals(versions[-1]['version'], 'peng')
 
 
@@ -241,8 +252,9 @@
     def test_overview_when_not_authenticated(self, mock_authenticate):
         mock_authenticate.return_value = False
 
-        self.assertRaises(TemplateDoesNotExist, self.client.get,
-            reverse('preflight-overview'))
+        response = self.client.get(reverse('preflight-overview'))
+
+        self.assertEqual(response.status_code, 404)
 
     @patch('preflight.views.render_to_response')
     @patch('preflight.views.authenticate')
@@ -262,6 +274,7 @@
     def test_gather_settings_no_location(self, mock_settings):
         mock_settings._wrapped.FOO = 'bar'
         mock_settings.FOO = 'bar'
+        mock_settings.PREFLIGHT_HIDDEN_SETTINGS = ''
         settings = gather_settings()
         expected = [{'name': 'FOO', 'value': 'bar', 'location': ''}]
         self.assertEqual(expected, settings)
@@ -270,6 +283,7 @@
     def test_gather_settings_with_location(self, mock_settings):
         mock_settings._wrapped.FOO = 'bar'
         mock_settings.FOO = 'bar'
+        mock_settings.PREFLIGHT_HIDDEN_SETTINGS = ''
         parser = Mock()
         parser.locate.return_value = '/tmp/baz'
         mock_settings.__CONFIGGLUE_PARSER__ = parser
@@ -279,43 +293,115 @@
 
     @patch('preflight.models.settings')
     def test_gather_settings_hidden(self, mock_settings):
-        mock_settings._wrapped.SECRET_FOO = 'bar'
-        mock_settings.SECRET_FOO = 'bar'
+        mock_settings._wrapped.FOO_ZOGGLES = 'bar'
+        mock_settings.FOO_ZOGGLES = 'bar'
+        mock_settings.PREFLIGHT_HIDDEN_SETTINGS = 'ZOGGLES'
         settings = gather_settings()
-        expected = [{'name': 'SECRET_FOO', 'value': '*' * 18, 'location': ''}]
+        expected = [{'name': 'FOO_ZOGGLES', 'value': '*' * 18, 'location': ''}]
         self.assertEqual(expected, settings)
 
     @patch('preflight.models.settings')
     def test_gather_settings_omitted(self, mock_settings):
         mock_settings._wrapped._FOO = 'bar'
         mock_settings._FOO = 'bar'
+        mock_settings.PREFLIGHT_HIDDEN_SETTINGS = ''
         settings = gather_settings()
         self.assertEqual([], settings)
 
 
+@skipIf(not settings.USE_GARGOYLE, 'skipping for Django 1.1')
 class GargoyleTestCase(TestCase):
+    from gargoyle import gargoyle  # NOQA
+    from gargoyle.models import (  # NOQA
+        Switch,
+        DISABLED,
+        SELECTIVE,
+        GLOBAL,
+        INHERIT
+    )
+
+    def setUp(self):
+        super(GargoyleTestCase, self).setUp()
+        from gargoyle.builtins import IPAddressConditionSet
+
+        self.gargoyle.register(IPAddressConditionSet())
+
+    def get_switches(self):
+        switches = [
+            self.Switch(key='DISABLED', status=self.DISABLED,
+                description='switch 1'),
+            self.Switch(key='SELECTIVE_1', status=self.SELECTIVE),
+            self.Switch(key='SELECTIVE_2', status=self.SELECTIVE),
+            self.Switch(key='GLOBAL', status=self.GLOBAL),
+            self.Switch(key='INHERIT', status=self.INHERIT),
+        ]
+        selective = switches[2]
+        selective.add_condition(
+            self.gargoyle,
+            condition_set='gargoyle.builtins.IPAddressConditionSet',
+            field_name='ip_address',
+            condition='127.0.0.1',
+        )
+        return switches
 
     @patch.dict(sys.modules, **{'gargoyle.models': None})
-    def test_gather_gargoyle_no_gargoyle(self):
+    def test_gather_switches_no_gargoyle(self):
         self.assertEqual(gather_gargoyle(), None)
 
-    @patch.dict(sys.modules, **{'gargoyle.models': Mock()})
-    def test_gather_gargoyle(self):
-        # Inner import to get the mocked version
-        from gargoyle.models import Switch as MockSwitch
-
-        mocks = [Mock(), Mock(), Mock()]
-        MockSwitch.objects.all.return_value = mocks
-        switches = [
-
-        ]
-        for switch, mock in zip(switches, mocks):
-            for attr, value in switch:
-                setattr(mock, attr, value)
-
+    def assert_switches_dict(self, actual):
         expected = [
-            {},
-            {},
-            {}
+            dict(name='DISABLED',
+                 status=self.DISABLED,
+                 description='switch 1',
+                 status_text=self.Switch.STATUS_LABELS[self.DISABLED],
+                 conditions=[]),
+            dict(name='SELECTIVE_1',
+                 status=self.SELECTIVE,
+                 description=None,
+                 status_text=self.Switch.STATUS_LABELS[self.GLOBAL],
+                 conditions=[]),
+            dict(name='SELECTIVE_2', status=self.SELECTIVE,
+                 description=None,
+                 status_text=self.Switch.STATUS_LABELS[self.SELECTIVE],
+                 conditions=['IP Address(ip_address=127.0.0.1)']),
+            dict(name='GLOBAL', status=self.GLOBAL,
+                 description=None,
+                 status_text=self.Switch.STATUS_LABELS[self.GLOBAL],
+                 conditions=[]),
+            dict(name='INHERIT', status=self.INHERIT,
+                 description=None,
+                 status_text=self.Switch.STATUS_LABELS[self.INHERIT],
+                 conditions=[]),
         ]
-        #self.assertEqual(gather_gargoyle(), expected)
+        self.assertEqual(actual, expected)
+
+    @patch('gargoyle.models.Switch.objects.all')
+    def test_gather_switches(self, mock_all):
+        mock_all.return_value = self.get_switches()
+        self.assert_switches_dict(gather_gargoyle())
+
+    @patch('gargoyle.models.Switch.objects.all')
+    def test_gargoyle_template(self, mock_all):
+        switches = self.get_switches()
+        mock_all.return_value = switches
+        the_switches = gather_switches()
+        context = {
+            "switches": the_switches,
+            "switches_json": json.dumps(the_switches),
+            "preflight_base_template": BASE_TEMPLATE,
+            "preflight_table_class": TABLE_CLASS,
+        }
+        response = render_to_string('preflight/overview.html', context)
+        dom = PyQuery(response)
+        table = dom.find('#switches-table tbody')
+        self.assertEqual(table.find('tr')[0][0].text, 'gargoyle')
+
+        for row, switch in zip(table.find('tr.switch'), switches):
+            self.assertEqual(row[0].text, switch.key)
+            self.assertEqual(row[1].text, str(switch.description))
+            self.assertEqual(row[3].text, switch.get_status_label())
+
+        data = json.loads(dom.find('#switches-json').text())
+        self.assertTrue('gargoyle' in data)
+        json_switches = data['gargoyle']
+        self.assert_switches_dict(json_switches)
 
=== modified file 'preflight/views.py'
--- preflight/views.py	2012-05-18 13:13:41 +0000
+++ preflight/views.py	2013-05-31 15:53:26 +0000
@@ -2,10 +2,10 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from datetime import datetime
+import json
 
 from django.views.decorators.cache import never_cache
 from django.http import Http404
-from django.conf import settings
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 
@@ -14,8 +14,9 @@
     gather_checks,
     gather_settings,
     gather_versions,
-    gather_gargoyle,
+    gather_switches,
 )
+from .conf import BASE_TEMPLATE, TABLE_CLASS
 
 
 @never_cache
@@ -23,17 +24,15 @@
     if not authenticate(request):
         raise Http404
 
-    base_template = getattr(settings, 'PREFLIGHT_BASE_TEMPLATE',
-                            "index.1col.html")
-    table_class = getattr(settings, 'PREFLIGHT_TABLE_CLASS', "listing")
-
+    switches = gather_switches()
     context = RequestContext(request, {
         "applications": gather_checks(),
         "versions": gather_versions(),
         "settings": gather_settings(),
-        "gargoyle": gather_gargoyle(),
+        "switches": switches,
+        "switches_json": json.dumps(switches),
         "now": datetime.now(),
-        "preflight_base_template": base_template,
-        'preflight_table_class': table_class,
+        "preflight_base_template": BASE_TEMPLATE,
+        "preflight_table_class": TABLE_CLASS,
     })
     return render_to_response("preflight/overview.html", context)
 
=== modified file 'setup.py'
--- setup.py	2011-02-11 13:06:42 +0000
+++ setup.py	2013-05-31 15:53:26 +0000
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
+import sys
+
 try:
     from ast import PyCF_ONLY_AST
 except ImportError:
@@ -14,24 +16,31 @@
             for line in open('preflight/__init__.py')
             if line.startswith('__version__')][0]
 
+tests_require = [
+    'mock > 0.6',
+    'gargoyle >= 0.6.0',
+    'pyquery',
+]
+
+if sys.version_info[:2] < (2, 7):
+    tests_require.append('unittest2')
 
 setup(
     name='django-preflight',
     version=get_version(),
-    author='Łukasz Czyżykowski',
+    author='Lukasz Czyzykowski',
     author_email='[e-mail]',
     description="Create a page for making sure all settings are correct.",
     long_description=open('README').read(),
     url='https://launchpad.net/django-preflight',
     download_url='https://launchpad.net/django-preflight/+download',
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Affero General Public License v3",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Topic :: Internet :: WWW/HTTP :: Site Management",
@@ -44,19 +53,14 @@
         'preflight.management.commands',
     ),
     package_data={
-        'preflight': [
-            'templates/preflight/*',
-        ],
+        'preflight': ['templates/preflight/*.html'],
     },
-    zip_safe=False,
     install_requires=[
-        'django >= 1.0'
-    ],
-    tests_require=[
-        'mock > 0.6'
-    ],
+        'django >= 1.1',
+    ],
+    tests_require=tests_require,
     extras_require={
         'docs': ['Sphinx'],
     },
-    test_suite='example_project.run.tests',
+    test_suite='preflight_example_project.run.tests',
 )
 
=== removed file 'tox'
--- tox	2011-02-10 12:43:01 +0000
+++ tox	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-import urllib
-url = "https://pytox.googlecode.com/hg/toxbootstrap.py"
-d = dict(__file__='toxbootstrap.py')
-exec urllib.urlopen(url).read() in d
-d['cmdline'](['--recreate'])
 \ No newline at end of file
 
=== modified file 'tox.ini'
--- tox.ini	2012-05-18 13:13:41 +0000
+++ tox.ini	2013-05-31 15:53:26 +0000
@@ -1,8 +1,10 @@
 [tox]
-envlist =
-        py2.5-django1.2, py2.5-django1.1, py2.5-django1.4, py2.5-django1.3,
-        py2.6-django1.2, py2.6-django1.1, py2.6-django1.4, py2.6-django1.3,
-        py2.7-django1.2, py2.7-django1.1, py2.7-django1.4, py2.7-django1.3,
+envlist = 
+        py2.6-django1.1, py2.7-django1.1,
+        py2.6-django1.2, py2.7-django1.2,
+        py2.6-django1.3, py2.7-django1.3,
+        py2.6-django1.4, py2.7-django1.4,
+        py2.6-django1.5, py2.7-django1.5,
         docs
 
 [testenv]
@@ -16,54 +18,44 @@
     sphinx-build -b doctest -d {envtmpdir}/doctrees . {envtmpdir}/doctest
     sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
-# Python 2.5
-[testenv:py2.5-django1.2]
-basepython = python2.5
-deps = django >= 1.2, < 1.3
-
-[testenv:py2.5-django1.1]
-basepython = python2.5
-deps = django >= 1.1, < 1.2
-
-[testenv:py2.5-django1.4]
-basetpython = python2.5
-deps = django >= 1.4, < 1.1
-
-[testenv:py2.5-django1.3]
-basepython = python2.5
-deps = django >= 1.3, < 1.4
-
 # Python 2.6
+[testenv:py2.6-django1.1]
+basepython = python2.6
+deps = django >= 1.1, < 1.2
+
 [testenv:py2.6-django1.2]
 basepython = python2.6
 deps = django >= 1.2, < 1.3
 
-[testenv:py2.6-django1.1]
+[testenv:py2.6-django1.3]
 basepython = python2.6
-deps = django >= 1.1, < 1.2
+deps = django >= 1.3, < 1.4
 
 [testenv:py2.6-django1.4]
-basetpython = python2.6
-deps = django >= 1.4, < 1.1
+basepython = python2.6
+deps = django >= 1.4, < 1.5
 
-[testenv:py2.6-django1.3]
+[testenv:py2.6-django1.5]
 basepython = python2.6
-deps = django >= 1.3, < 1.4
+deps = django >= 1.5, < 1.6
 
 # Python 2.7
+[testenv:py2.7-django1.1]
+basepython = python2.7
+deps = django >= 1.1, < 1.2
+
 [testenv:py2.7-django1.2]
 basepython = python2.7
 deps = django >= 1.2, < 1.3
 
-[testenv:py2.7-django1.1]
+[testenv:py2.7-django1.3]
 basepython = python2.7
-deps = django >= 1.1, < 1.2
+deps = django >= 1.3, < 1.4
 
 [testenv:py2.7-django1.4]
-basetpython = python2.7
-deps = django >= 1.4, < 1.1
-
-[testenv:py2.7-django1.3]
-basepython = python2.7
-deps = django >= 1.3, < 1.4
-
+basepython = python2.7
+deps = django >= 1.4, < 1.5
+
+[testenv:py2.7-django1.5]
+basepython = python2.7
+deps = django >= 1.5, < 1.6