From 00f1165807e638120e936e4ee184eb9072bc68e2 Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Sun, 14 Jun 2015 05:01:51 +1000 Subject: [PATCH 1/4] Add missing RST directive to README. --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 9fd100c..6ad8405 100644 --- a/README.rst +++ b/README.rst @@ -57,6 +57,8 @@ If you'd like support for the Meteor Accounts package (ie: login/logout with django.contrib.auth) consult the section on authentication below and use the following line instead: +.. code:: python + # settings.py ... INSTALLED_APPS = list(INSTALLED_APPS) + ['dddp', 'dddp.accounts'] From 34f862bb3d89aec16ef57b4b7ec3bb2f2fbcc231 Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Tue, 16 Jun 2015 17:49:39 +1000 Subject: [PATCH 2/4] Pylint cleanup. --- dddp/server/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dddp/server/views.py b/dddp/server/views.py index c30fd30..002e825 100644 --- a/dddp/server/views.py +++ b/dddp/server/views.py @@ -46,4 +46,4 @@ class MeteorView(View): except KeyError: print(path) return HttpResponse(self.app.html) - #raise Http404 + # raise Http404 From 2f69881e1470584c6f1253e7f3764d57912eabb1 Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Tue, 16 Jun 2015 17:50:10 +1000 Subject: [PATCH 3/4] Handle django.contrib.postgres.fields.ArrayField in serialization. --- dddp/api.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dddp/api.py b/dddp/api.py index cdce7b7..542696f 100644 --- a/dddp/api.py +++ b/dddp/api.py @@ -10,6 +10,7 @@ import traceback import dbarray from django.conf import settings from django.contrib.auth import get_user_model +import django.contrib.postgres.fields from django.db import connection, connections from django.db.models import aggregates, Q try: @@ -390,6 +391,8 @@ class Collection(APIMixin): fields[field.column] = get_meteor_id( rel.to, fields.pop(field.name), ) + elif isinstance(field, django.contrib.postgres.fields.ArrayField): + fields[field.name] = field.to_python(fields.pop(field.name)) for field in meta.local_many_to_many: fields['%s_ids' % field.name] = get_meteor_ids( field.rel.to, fields.pop(field.name), From 5fb5d68fb59f59d617975f00011a652cb6f1664b Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Tue, 16 Jun 2015 17:53:48 +1000 Subject: [PATCH 4/4] Update CHANGES.py, bump version number. --- CHANGES.rst | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index adf4092..f5b8d98 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Change Log ========== +0.9.1 +----- +* Added support for django.contrib.postres.fields.ArrayField + serialization. + 0.9.0 ----- * Added Django 1.8 compatibility. The current implementation has a diff --git a/setup.py b/setup.py index c768106..a7b6676 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='django-ddp', - version='0.9.0', + version='0.9.1', description=__doc__, long_description=open('README.rst').read(), author='Tyson Clugg',