david / django-portablecontacts / changeset / 102195ccdbf9

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

 convert_classname_to_name = {
     'portablecontacts:contactemail': 'emails',
     'portablecontacts:contacturl': 'urls',
     'portablecontacts:contactphonenumber': 'phoneNumbers',
     'portablecontacts:contactim': 'ims',
     'portablecontacts:contactphoto': 'photos',
     'portablecontacts:contacttag': 'tags',
     'portablecontacts:contactrelationship': 'relationships',
     'portablecontacts:contactaddress': 'addresses',
     'portablecontacts:contactorganization': 'organizations',
     'portablecontacts:contactaccount': 'accounts',
+}

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

@@ -4,32 +4,28 @@ from django.utils.encoding import smart_
 from django.core.serializers.python import Serializer as DjangoPythonSerializer
 from portablecontacts.models import contact_model
 from portablecontacts.serializers import convert_classname_to_name
 convert_classname_to_name = {
     'portablecontacts:contactemail': 'emails',
     'portablecontacts:contacturl': 'urls',
     'portablecontacts:contactphonenumber': 'phoneNumbers',
     'portablecontacts:contactim': 'ims',
     'portablecontacts:contactphoto': 'photos',
     'portablecontacts:contacttag': 'tags',
     'portablecontacts:contactrelationship': 'relationships',
     'portablecontacts:contactaddress': 'addresses',
     'portablecontacts:contactorganization': 'organizations',
     'portablecontacts:contactaccount': 'accounts',
+}
 class Serializer(DjangoPythonSerializer):
     """
     Serializes a QuerySet to basic Python objects.
     """
     def start_object(self, obj):
         """
         Called as each object is handled.
         """
         self._current = {}
         if isinstance(obj, contact_model):
             self._current.update({
                 "id": smart_unicode(obj._get_pk_val(), strings_only=True),
             })
     def end_object(self, obj):
         """
         Called after handling all fields for an object.
         """
         if isinstance(obj, contact_model):
             self._current.update({
                 "id": smart_unicode(obj._get_pk_val(), strings_only=True),
             })
             for rel_object in obj._meta.get_all_related_objects():
                 objects = rel_object.model.objects.filter(contact=obj)
                 if objects:
@@ -93,10 +89,8 @@ class Serializer(DjangoPythonSerializer)
             return
         if field_name == 'type':
             type_display = getattr(obj, 'get_%s_display' % field_name)()
             self._current_reverse[field_name] = smart_unicode(type_display, strings_only=True)
         else:
             self._current_reverse[field_name] = smart_unicode(field_content, strings_only=True)
             field_content = getattr(obj, 'get_%s_display' % field_name)()
         self._current_reverse[field_name] = smart_unicode(field_content, strings_only=True)
     def handle_fk_field(self, obj, field):
         """

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

@@ -3,6 +3,9 @@ from django.core.serializers.xml_seriali
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.encoding import smart_unicode
 from portablecontacts.models import contact_model
 from portablecontacts.serializers import convert_classname_to_name
 class Serializer(DjangoXMLSerializer):
     """
     Convert a queryset to XML.
@@ -16,6 +19,14 @@ class Serializer(DjangoXMLSerializer):
         self.xml = SimplerXMLGenerator(self.stream, self.options.get("encoding", settings.DEFAULT_CHARSET))
         self.xml.startDocument()
         self.xml.startElement("response", {})
         if not self.options.get('unique', False):
             self.indent(1)
             self.xml.addQuickElement("startIndex", self.options.get('startIndex', '0'))
             self.indent(1)
             self.xml.addQuickElement("itemsPerPage", self.options.get('itemsPerPage', '0'))
             self.indent(1)
             self.xml.addQuickElement("totalResults", self.options.get('totalResults', '0'))
     def end_serialization(self):
         """
@@ -31,11 +42,28 @@ class Serializer(DjangoXMLSerializer):
         """
         self.indent(1)
         self.xml.startElement("entry", {})
         self.indent(2)
         self.xml.addQuickElement('id', smart_unicode(obj.id))
         self.has_name = False
         self.has_displayName = False
     def end_object(self, obj):
         """
         Called after handling all fields for an object.
         """
         if isinstance(obj, contact_model):
             for rel_object in obj._meta.get_all_related_objects():
                 objects = rel_object.model.objects.filter(contact=obj)
                 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")
@@ -46,13 +74,35 @@ class Serializer(DjangoXMLSerializer):
         """
         # Get a "string version" of the object's data (this is handled by the
         # serializer base class).
         field_content = getattr(obj, field.name)
         if not field_content or field.name in ('published', 'updated'):
             return
         self.indent(2)
         value = self.get_string_value(obj, field)
-        self.xml.addQuickElement(field.name, smart_unicode(value))
+        field_name = field.name
         field_content = getattr(obj, field_name)
         if field_content:
             if field_name in ('userName', 'familyName', 'givenName',
                 'middleName', 'honorificPrefix', 'honorificSuffix'):
                 if not self.has_displayName:
                     self.indent(2)
                     self.xml.addQuickElement('displayName', smart_unicode(getattr(obj, 'displayName'), strings_only=True))
                     self.has_displayName = True
                 if field_name in ('familyName', 'givenName', 'middleName',
                     'honorificPrefix', 'honorificSuffix'):
                     if not self.has_name:
                         self.indent(2)
                         self.xml.startElement("name", {})
                         for local_field_name in ('familyName', 'givenName', 'middleName',
                             'honorificPrefix', 'honorificSuffix'):
                             local_field_content = smart_unicode(getattr(obj, local_field_name), strings_only=True)
                             if local_field_content:
                                 self.indent(3)
                                 self.xml.addQuickElement(local_field_name, local_field_content)
                         self.indent(2)
                         self.xml.endElement("name")
                         self.has_name = True
             elif field_name not in ('published', 'updated'):
                 self.indent(2)
                 value = self.get_string_value(obj, field)
                 self.xml.addQuickElement(field_name, value)
     def handle_fk_field(self, obj, field):
         """
@@ -60,3 +110,33 @@ class Serializer(DjangoXMLSerializer):
         differently from regular fields).
         """
         pass
     def handle_reverse_fk_fields(self, objs, name):
         """
         Called to handle a models which have a ForeignKey to the current oject.
         """
         objects = []
         self._current_reverse = {}
         for obj in objs:
             self.indent(2)
             self.xml.startElement(name, {})
             for field in obj._meta.local_fields:
                 if field.serialize and field.rel is None \
                     and (self.selected_fields is None or field.attname in self.selected_fields):
                     field_name = field.name
                     field_content = getattr(obj, field_name)
                     if not field_content or (field_name=='primary' and field_content==False):
                         continue
                     if field_content == False:
                         field_content = 'false'
                     elif field_content == True:
                         field_content = 'true'
                     self.indent(3)
                     if field_name == 'type':
                         field_content = getattr(obj, 'get_%s_display' % field_name)()
                     self.xml.addQuickElement(field.name, smart_unicode(field_content, strings_only=True))
             self.indent(2)
             self.xml.endElement(name)

Up to file-list portablecontacts/tests.py:

@@ -371,8 +371,98 @@ data:
+       }
+      }
-XML representation::
+XML representations::
       >>> response = c.get("/portablecontacts/@me/@all/", {'format': 'xml'})
       >>> response.status_code
       >>> print response.content
       <?xml version="1.0" encoding="utf-8"?>
       <response>
        <startIndex>0</startIndex>
        <itemsPerPage>0</itemsPerPage>
        <totalResults>0</totalResults>
        <entry>
         <id>1</id>
         <displayName>Minimal Contact</displayName>
        </entry>
        <entry>
         <id>2</id>
         <displayName>Mork Hashimoto</displayName>
         <name>
          <familyName>Hashimoto</familyName>
          <givenName>Mork</givenName>
         </name>
         <emails>
          <value>mhashimoto-04@plaxo.com</value>
          <type>work</type>
          <primary>true</primary>
         </emails>
         <emails>
          <value>mhashimoto-04@plaxo.com</value>
          <type>home</type>
         </emails>
         <urls>
          <value>http://www.seeyellow.com</value>
          <type>work</type>
         </urls>
         <urls>
          <value>http://www.angryalien.com</value>
          <type>home</type>
         </urls>
         <phoneNumbers>
          <value>KLONDIKE5</value>
          <type>work</type>
         </phoneNumbers>
         <phoneNumbers>
          <value>650-123-4567</value>
          <type>mobile</type>
         </phoneNumbers>
         <ims>
          <value>plaxodev8</value>
          <type>aim</type>
         </ims>
         <photos>
          <value>http://sample.site.org/photos/12345.jpg</value>
          <type>thumbnail</type>
         </photos>
         <tags>
          <value>plaxo guy</value>
         </tags>
         <relationships>
          <value>friend</value>
         </relationships>
         <addresses>
          <formatted>742 Evergreen Terrace
       Suite 123
       Springfield VT 12345 USA</formatted>
          <type>home</type>
          <streetAddress>742 Evergreen Terrace
       Suite 123</streetAddress>
          <locality>Springfield</locality>
          <region>VT</region>
          <postalCode>12345</postalCode>
          <country>USA</country>
         </addresses>
         <organizations>
          <name>Burns Worldwide</name>
          <title>Head Bee Guy</title>
         </organizations>
         <accounts>
          <domain>plaxo.com</domain>
          <userid>2706</userid>
         </accounts>
        </entry>
        <entry>
         <id>3</id>
         <displayName>David Larlet</displayName>
         <name>
          <familyName>Larlet</familyName>
          <givenName>David</givenName>
         </name>
         <preferredUsername>david</preferredUsername>
        </entry>
       </response>
       >>> response = c.get("/portablecontacts/@me/@all/1/", {'format': 'xml'})
       >>> response.status_code
@@ -380,7 +470,8 @@ XML representation::
       <?xml version="1.0" encoding="utf-8"?>
       <response>
        <entry>
-        <userName>Minimal Contact</userName>
+       <id>1</id>
         <displayName>Minimal Contact</displayName>
        </entry>
       </response>

Up to file-list portablecontacts_example/manage.py:

 import sys, os
-sys.path = [os.path.join(os.getcwd(), '../')] + sys.path
+sys.path = [os.path.join(os.getcwd(), '../'), '../../../lib/django_one'] + sys.path
 from django.core.management import execute_manager

commit 1:	102195ccdbf9
parent 0:	679eb8567412
branch:	default

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