Merge lp:~ricardokirkner/gargoyle/update-0.10.7 into lp:~ubuntuone-pqm-team/gargoyle/stable

[Ricardo Kirkner]

merge trunk@270 (0.10.7)

This branch pulls changes from trunk (upstream) up to tag 0.10.7.

These changes include the contributions made to upstream, so that once this lands we can remove them from our projects.

[Michael Nelson (michael.nelson)]

review: Approve

[Ricardo Kirkner (ricardokirkner)]

Rubber-stamping

review: Approve

=== added file '.arcconfig'
--- .arcconfig	1970-01-01 00:00:00 +0000
+++ .arcconfig	2013-05-16 14:35:12 +0000
@@ -0,0 +1,15 @@
+{
+  "project_id": "gargoyle",
+  "conduit_uri" : "http://phabricator.local.disqus.net/",
+  "arcanist_configuration": "DisqusConfiguration",
+  "copyright_holder": "Disqus, Inc.",
+  "immutable_history": false,
+  "differential.field-selector": "DisqusDifferentialFieldSelector",
+  "phutil_libraries": {
+      "disqus": "/usr/local/include/php/libdisqus/src"
+  },
+  "lint_engine": "ComprehensiveLintEngine",
+  "lint.pep8.options": "--ignore=W391,W292,W293,E501,E225",
+  "lint.jshint.prefix": "node_modules/jshint/bin",
+  "lint.jshint.bin": "hint"
+}

=== modified file '.gitignore'
--- .gitignore	2012-11-19 19:17:51 +0000
+++ .gitignore	2013-05-16 14:35:12 +0000
@@ -2,7 +2,6 @@
 *.egg-info
 *.egg
 .DS_Store
-.arcconfig
 .coverage
 /dist
 /build

=== modified file '.travis.yml'
--- .travis.yml	2012-08-02 20:08:52 +0000
+++ .travis.yml	2013-05-16 14:35:12 +0000
@@ -3,11 +3,15 @@
   - "2.6"
   - "2.7"
 env:
-  - DJANGO=1.2.7
-  - DJANGO=1.3.1
-  - DJANGO=1.4
+  - DJANGO=1.2.7 MODELDICT=1.2.0
+  - DJANGO=1.3.1 MODELDICT=1.2.0
+  - DJANGO=1.4 MODELDICT=1.2.0
+  - DJANGO=1.2.7 MODELDICT=1.4.1
+  - DJANGO=1.3.1 MODELDICT=1.4.1
+  - DJANGO=1.4 MODELDICT=1.4.1
 install:
   - pip install -q Django==$DJANGO --use-mirrors
+  - pip install -q django-modeldict==$MODELDICT --use-mirrors
   - pip install -q flake8 --use-mirrors
   - pip install -q -e . --use-mirrors
 script:

=== modified file 'gargoyle/builtins.py'
--- gargoyle/builtins.py	2012-08-08 00:49:42 +0000
+++ gargoyle/builtins.py	2013-05-16 14:35:12 +0000
@@ -15,6 +15,7 @@
 from django.core.validators import validate_ipv4_address
 
 import socket
+import struct
 
 
 class UserConditionSet(ModelConditionSet):
@@ -64,13 +65,23 @@
         # XXX: can we come up w/ a better API?
         # Ensure we map ``percent`` to the ``id`` column
         if field_name == 'percent':
-            return sum([int(x) for x in instance.META['REMOTE_ADDR'].split('.')])
+            return self._ip_to_int(instance.META['REMOTE_ADDR'])
         elif field_name == 'ip_address':
             return instance.META['REMOTE_ADDR']
         elif field_name == 'internal_ip':
             return instance.META['REMOTE_ADDR'] in settings.INTERNAL_IPS
         return super(IPAddressConditionSet, self).get_field_value(instance, field_name)
 
+    def _ip_to_int(self, ip):
+        if '.' in ip:
+            # IPv4
+            return sum([int(x) for x in ip.split('.')])
+        if ':' in ip:
+            # IPv6
+            hi, lo = struct.unpack('!QQ', socket.inet_pton(socket.AF_INET6, ip))
+            return (hi << 64) | lo
+        raise ValueError('Invalid IP Address %r' % ip)
+
     def get_group_label(self):
         return 'IP Address'
 

=== added directory 'gargoyle/management'
=== added file 'gargoyle/management/__init__.py'
=== added directory 'gargoyle/management/commands'
=== added file 'gargoyle/management/commands/__init__.py'
=== added file 'gargoyle/management/commands/add_switch.py'
--- gargoyle/management/commands/add_switch.py	1970-01-01 00:00:00 +0000
+++ gargoyle/management/commands/add_switch.py	2013-05-16 14:35:12 +0000
@@ -0,0 +1,32 @@
+from optparse import make_option
+from django.core.management.base import BaseCommand, CommandError
+
+from gargoyle.models import Switch, DISABLED, GLOBAL
+
+
+class Command(BaseCommand):
+    args = 'switch_name'
+    help = 'Adds or updates the specified gargoyle switch.'
+
+    option_list = BaseCommand.option_list + (
+        make_option(
+            '--disabled',
+            action='store_const',
+            const=DISABLED,
+            default=GLOBAL,
+            dest='status',
+            help='Create a disabled switch.'),
+    )
+
+    def handle(self, *args, **kwargs):
+        if len(args) != 1:
+            raise CommandError("Specify a gargoyle switch name to add.")
+
+        status = kwargs['status']
+        switch, created = Switch.objects.get_or_create(
+            key=args[0],
+            defaults=dict(status=status),
+        )
+        if not created and switch.status != status:
+            switch.status = status
+            switch.save()

=== added file 'gargoyle/management/commands/remove_switch.py'
--- gargoyle/management/commands/remove_switch.py	1970-01-01 00:00:00 +0000
+++ gargoyle/management/commands/remove_switch.py	2013-05-16 14:35:12 +0000
@@ -0,0 +1,14 @@
+from django.core.management.base import BaseCommand, CommandError
+
+from gargoyle.models import Switch
+
+
+class Command(BaseCommand):
+    args = 'switch_name'
+    help = 'Removes the specified gargoyle switch.'
+
+    def handle(self, *args, **kwargs):
+        if len(args) != 1:
+            raise CommandError("Specify a gargoyle switch name to remove.")
+
+        Switch.objects.filter(key=args[0]).delete()

=== modified file 'gargoyle/nexus_modules.py'
--- gargoyle/nexus_modules.py	2012-07-30 20:51:17 +0000
+++ gargoyle/nexus_modules.py	2013-05-16 14:35:12 +0000
@@ -123,13 +123,13 @@
         if not key:
             raise GargoyleException("Key cannot be empty")
 
-        if len(key) > 32:
-            raise GargoyleException("Key must be less than or equal to 32 characters in length")
+        if len(key) > 64:
+            raise GargoyleException("Key must be less than or equal to 64 characters in length")
 
         label = request.POST.get("name", "").strip()
 
-        if len(label) > 32:
-            raise GargoyleException("Name must be less than or equal to 32 characters in length")
+        if len(label) > 64:
+            raise GargoyleException("Name must be less than or equal to 64 characters in length")
 
         switch, created = Switch.objects.get_or_create(
             key=key,
@@ -159,13 +159,13 @@
 
         key = request.POST.get("key")
 
-        if len(key) > 32:
-            raise GargoyleException("Key must be less than or equal to 32 characters in length")
+        if len(key) > 64:
+            raise GargoyleException("Key must be less than or equal to 64 characters in length")
 
         label = request.POST.get("name", "")
 
-        if len(label) > 32:
-            raise GargoyleException("Name must be less than or equal to 32 characters in length")
+        if len(label) > 64:
+            raise GargoyleException("Name must be less than or equal to 64 characters in length")
 
         values = dict(
             label=label,

=== modified file 'setup.py'
--- setup.py	2012-12-04 19:56:17 +0000
+++ setup.py	2013-05-16 14:35:12 +0000
@@ -17,13 +17,13 @@
 install_requires = [
     'django-modeldict>=1.2.0',
     'nexus>=0.2.3',
-    'django-jsonfield>=0.8.0',
+    'django-jsonfield>=0.8.0,<0.9.4',
 ]
 
 
 setup(
     name='gargoyle',
-    version='0.10.6',
+    version='0.10.7',
     author='DISQUS',
     author_email='[e-mail]',
     url='http://github.com/disqus/gargoyle',

=== modified file 'tests/tests.py'
--- tests/tests.py	2012-08-09 22:19:20 +0000
+++ tests/tests.py	2013-05-16 14:35:12 +0000
@@ -8,6 +8,8 @@
 from django.conf import settings
 from django.contrib.auth.models import User, AnonymousUser
 from django.core.cache import cache
+from django.core.management.base import CommandError
+from django.core.management import call_command
 from django.http import HttpRequest, Http404, HttpResponse
 from django.test import TestCase
 from django.template import Context, Template, TemplateSyntaxError
@@ -16,6 +18,10 @@
 from gargoyle.decorators import switch_is_active
 from gargoyle.helpers import MockRequest
 from gargoyle.models import Switch, SELECTIVE, DISABLED, GLOBAL, INHERIT
+from gargoyle.management.commands.add_switch import Command as AddSwitchCmd
+from gargoyle.management.commands.remove_switch import (
+    Command as RemoveSwitchCmd
+)
 from gargoyle.manager import SwitchManager
 from gargoyle.testutils import switches
 
@@ -381,7 +387,7 @@
         self.assertFalse(self.gargoyle.is_active('test'))
 
         # in memory cache shouldnt have expired
-        cache.delete(self.gargoyle.cache_key)
+        cache.delete(self.gargoyle.remote_cache_key)
         self.assertFalse(self.gargoyle.is_active('test'))
         switch.status, switch.value = GLOBAL, {}
         # Ensure post save gets sent
@@ -524,6 +530,18 @@
         )
         self.assertFalse(self.gargoyle.is_active('test', request))
 
+        self.assertTrue(self.gargoyle.is_active('test', self.gargoyle.as_request(ip_address='::1')))
+
+        switch.clear_conditions(
+            condition_set=condition_set,
+        )
+        switch.add_condition(
+            condition_set=condition_set,
+            field_name='percent',
+            condition='0-50',
+        )
+        self.assertFalse(self.gargoyle.is_active('test', request))
+
     def test_to_dict(self):
         condition_set = 'gargoyle.builtins.IPAddressConditionSet'
 
@@ -1073,3 +1091,82 @@
             self.assertFalse(self.gargoyle.is_active('test'))
 
         self.assertEquals(self.gargoyle['test'].status, GLOBAL)
+
+
+class CommandAddSwitchTestCase(TestCase):
+
+    def setUp(self):
+        self.gargoyle = SwitchManager(Switch, key='key', value='value', instances=True, auto_create=True)
+
+    def test_requires_single_arg(self):
+        too_few_too_many = [
+            [],
+            ['one', 'two'],
+        ]
+        for args in too_few_too_many:
+            command = AddSwitchCmd()
+
+            self.assertRaises(CommandError, command.handle, *args)
+
+    def test_add_switch_default_status(self):
+        self.assertNotIn('switch_default', self.gargoyle)
+
+        call_command('add_switch', 'switch_default')
+
+        self.assertIn('switch_default', self.gargoyle)
+        self.assertEqual(GLOBAL, self.gargoyle['switch_default'].status)
+
+    def test_add_switch_with_status(self):
+        self.assertNotIn('switch_disabled', self.gargoyle)
+
+        call_command('add_switch', 'switch_disabled', status=DISABLED)
+
+        self.assertIn('switch_disabled', self.gargoyle)
+        self.assertEqual(DISABLED, self.gargoyle['switch_disabled'].status)
+
+    def test_update_switch_status_disabled(self):
+        Switch.objects.create(key='test', status=GLOBAL)
+        self.assertEqual(GLOBAL, self.gargoyle['test'].status)
+
+        call_command('add_switch', 'test', status=DISABLED)
+
+        self.assertEqual(DISABLED, self.gargoyle['test'].status)
+
+    def test_update_switch_status_to_default(self):
+        Switch.objects.create(key='test', status=DISABLED)
+        self.assertEqual(DISABLED, self.gargoyle['test'].status)
+
+        call_command('add_switch', 'test')
+
+        self.assertEqual(GLOBAL, self.gargoyle['test'].status)
+
+
+class CommandRemoveSwitchTestCase(TestCase):
+
+    def setUp(self):
+        self.gargoyle = SwitchManager(Switch, key='key', value='value', instances=True, auto_create=True)
+
+    def test_requires_single_arg(self):
+        too_few_too_many = [
+            [],
+            ['one', 'two'],
+        ]
+        for args in too_few_too_many:
+            command = RemoveSwitchCmd()
+
+            self.assertRaises(CommandError, command.handle, *args)
+
+    def test_removes_switch(self):
+        Switch.objects.create(key='test')
+        self.assertIn('test', self.gargoyle)
+
+        call_command('remove_switch', 'test')
+
+        self.assertNotIn('test', self.gargoyle)
+
+    def test_remove_non_switch_doesnt_error(self):
+        self.assertNotIn('idontexist', self.gargoyle)
+
+        call_command('remove_switch', 'idontexist')
+
+        self.assertNotIn('idontexist', self.gargoyle)