david / django-portablecontacts / changeset / d759edee4b66

Up to file-list portablecontacts/serializers/json.py:

@@ -13,20 +13,21 @@ class Serializer(PythonSerializer):
         """
         End serialization -- end the document.
         """
         objects = {
             'entry': self.options.pop('for_self', False) and self.objects[0] or self.objects
+        }
+        objects = {}
         if not self.options.pop('unique', False):
             objects.update({
                 'startIndex': self.options.pop('startIndex', 0),
-                'totalResults': len(self.objects),
+                'totalResults': self.options.pop('totalResults', 0),
             })
-        if self.options.get('itemsPerPage', False):
+        if self.options.get('count', False):
             objects.update({
-                'itemsPerPage': self.options.pop('itemsPerPage', False),
+                'itemsPerPage': self.options.pop('count'),
             })
         self.options.pop('stream', None)
         self.options.pop('fields', None)
         objects.update({
             'entry': self.options.pop('for_self', False) and self.objects[0] or self.objects
         })
         simplejson.dump(objects, self.stream, cls=DjangoJSONEncoder, **self.options)
     def getvalue(self):

Up to file-list portablecontacts/serializers/xml_serializer.py:

@@ -22,11 +22,11 @@ class Serializer(DjangoXMLSerializer):
         if not self.options.get('unique', False):
             self.indent(1)
-            self.xml.addQuickElement("startIndex", self.options.get('startIndex', '0'))
+            self.xml.addQuickElement("startIndex", str(self.options.get('startIndex', 0)))
             self.indent(1)
-            self.xml.addQuickElement("itemsPerPage", self.options.get('itemsPerPage', '0'))
+            self.xml.addQuickElement("itemsPerPage", str(self.options.get('count', '0')))
             self.indent(1)
-            self.xml.addQuickElement("totalResults", self.options.get('totalResults', '0'))
+            self.xml.addQuickElement("totalResults", str(self.options.get('totalResults', '0')))
     def end_serialization(self):
         """
@@ -58,12 +58,7 @@ class Serializer(DjangoXMLSerializer):
                 if objects:
                     name = convert_classname_to_name[rel_object.name]
                     self.handle_reverse_fk_fields(objects, name)
             #if 'tags' in self._current:
             #    self._current['tags'] = [tag['value'] for tag in self._current['tags']]
             #if 'relationships' in self._current:
             #    self._current['relationships'] = [relationship['value'] \
             #                                        for relationship in self._current['relationships']]
         self.indent(1)
         self.xml.endElement("entry")

Up to file-list portablecontacts/tests.py:

@@ -245,6 +245,9 @@ data:
       >>> print response.content
+      {
        "itemsPerPage": 100,
        "startIndex": 0,
        "totalResults": 3,
        "entry": [
+        {
          "displayName": "Minimal Contact",
@@ -278,7 +281,17 @@ data:
          "tags": [
           "plaxo guy"
          ],
-         "id": 2,
+         "emails": [
+          {
            "type": "work",
            "primary": true,
            "value": "mhashimoto-04@plaxo.com"
           },
+          {
            "type": "home",
            "value": "mhashimoto-04@plaxo.com"
+          }
          ],
          "photos": [
+          {
            "type": "thumbnail",
@@ -307,17 +320,7 @@ data:
            "value": "http://www.angryalien.com"
+          }
          ],
          "emails": [
+          {
            "type": "work",
            "primary": true,
            "value": "mhashimoto-04@plaxo.com"
           },
+          {
            "type": "home",
            "value": "mhashimoto-04@plaxo.com"
+          }
-         ],
+         "id": 2,
          "addresses": [
+          {
            "locality": "Springfield",
@@ -333,15 +336,13 @@ data:
+        {
          "preferredUsername": "david",
          "displayName": "David Larlet",
          "id": 3,
          "name": {
           "givenName": "David",
           "familyName": "Larlet"
          },
          "id": 3
+         }
+        }
        ],
        "startIndex": 0,
-       "totalResults": 3
+       ]
+      }
       >>> response = c.get("/portablecontacts/@me/@all/1/")
       >>> response.status_code
@@ -380,8 +381,8 @@ XML representations::
       <?xml version="1.0" encoding="utf-8"?>
       <response>
        <startIndex>0</startIndex>
        <itemsPerPage>0</itemsPerPage>
        <totalResults>0</totalResults>
        <itemsPerPage>100</itemsPerPage>
        <totalResults>3</totalResults>
        <entry>
         <id>1</id>
         <displayName>Minimal Contact</displayName>
@@ -463,18 +464,37 @@ XML representations::
         <preferredUsername>david</preferredUsername>
        </entry>
       </response>
       >>> response = c.get("/portablecontacts/@me/@all/1/", {'format': 'xml'})
       >>> response.status_code
       >>> print response.content
       <?xml version="1.0" encoding="utf-8"?>
       <response>
        <entry>
        <id>1</id>
         <displayName>Minimal Contact</displayName>
        </entry>
       </response>
 Pagination
 ----------
 Just the first entry::
     >>> response = c.get("/portablecontacts/@me/@all/", {'startIndex':0, 'count':1})
     >>> response.status_code
     >>> print response.content
+    {
      "itemsPerPage": 1,
      "startIndex": 0,
      "totalResults": 3,
      "entry": [
+      {
        "displayName": "Minimal Contact",
        "id": 1
+      }
+     ]
+    }
 And now entries 2 and 3::
     >>> response = c.get("/portablecontacts/@me/@all/", {'startIndex':1, 'count':2})
     >>> response.status_code
     >>> print response.content
 """

Up to file-list portablecontacts/views.py:

 from django.conf import settings
 from django.core import serializers
 from django.http import HttpResponse
 from django.core.paginator import Paginator
 from django.core.urlresolvers import reverse
 from portablecontacts.utils import get_base_url, check_serializer, \
@@ -11,14 +12,32 @@ def retrieve(request, id=None, format='j
     format = 'poco-%s' % request.GET.get('format', format)
     check_serializer(format)
     try:
         options = {'indent': True}
         if id is None:
             contacts = request.user.contact_set.all()
-            unique = False
+            # pagination
             startIndex = int(request.GET.get('startIndex', 0))
             count = int(request.GET.get('count', 100))
             paginator = Paginator(contacts, count)
             # Django pagination is by page and start at 1
             # Portable contacts one is by element index and start at 0
             if startIndex:
                 # TODO: write a custom paginator based on indexes and not pages
                 contacts = paginator.page(startIndex+1).object_list
             else:
                 contacts = paginator.page(1).object_list
             options.update({
                 'unique': False,
                 'startIndex': startIndex,
                 'count': count,
                 'totalResults': paginator.count,
             })
         else:
             contacts = [contact_model.objects.get(id=id, user=request.user)]
             unique = True
-        response = serializers.serialize(format, contacts, indent=True, unique=unique)
+            options.update({
                 'unique': True,
             })
         response = serializers.serialize(format, contacts, **options)
     except contact_model.DoesNotExist:
         response = ''
@@ -31,7 +50,8 @@ def retrieve_self(request, format='json'
         contact = contact_model.objects.get(
                         preferredUsername=request.user.username,
                         user=request.user)
-        response = serializers.serialize(format, [contact], indent=True, unique=True, for_self=True)
+        options = {'indent': True, 'unique': True, 'for_self': True}
         response = serializers.serialize(format, [contact], **options)
     except contact_model.DoesNotExist:
         response = ''

commit 2:	d759edee4b66
parent 1:	102195ccdbf9
branch:	default

david / django-portablecontacts (http://portablecontacts.net/)