david / django-roa / changeset / 55aa123c5ab9

Up to file-list django_roa/db/models.py:

 import sys
 import logging
 from django.conf import settings
 from django.core import serializers
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError
@@ -13,6 +15,8 @@ from django.utils.functional import curr
 from restclient import Resource, RequestFailed
 from django_roa.db.exceptions import ROAException
 logger = logging.getLogger("django_roa")
 ROA_MODEL_NAME_MAPPING = getattr(settings, 'ROA_MODEL_NAME_MAPPING', [])
@@ -282,12 +286,16 @@ class ROAModel(models.Model):
         if force_update or pk_set and not self.id is None:
             resource = Resource(self.get_resource_url_detail())
             try:
                 logger.debug(u"""Modifying : "%s" through %s""" % \
                     (self, resource.uri))
                 response = resource.put(payload=args, **get_args)
             except RequestFailed, e:
                 raise ROAException(e)
         else:
             resource = Resource(self.get_resource_url_list())
             try:
                 logger.debug(u"""Creating  : "%s" through %s""" % \
                     (self, resource.uri))
                 response = resource.post(payload=args, **get_args)
             except RequestFailed, e:
                 raise ROAException(e)
@@ -304,9 +312,12 @@ class ROAModel(models.Model):
     def delete(self):
         assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname)
         # Deletion in cascade should be done server side.
         resource = Resource(self.get_resource_url_detail())
         logger.debug(u"""Deleting  : "%s" through %s""" % \
             (self, resource.uri))
         response = resource.delete()
     delete.alters_data = True

Up to file-list django_roa/db/query.py:

 import logging
 from django.conf import settings
 from django.db.models import query
 from django.core import serializers
@@ -7,6 +9,8 @@ from django.db.models.query_utils import
 from restclient import Resource, ResourceNotFound, RequestFailed
 from django_roa.db.exceptions import ROAException
 logger = logging.getLogger("django_roa")
 ROA_MODEL_NAME_MAPPING = getattr(settings, 'ROA_MODEL_NAME_MAPPING', [])
 ROA_ARGS_NAMES_MAPPING = getattr(settings, 'ROA_ARGS_NAMES_MAPPING', {})
@@ -186,7 +190,11 @@ class RemoteQuerySet(query.QuerySet):
         resource = Resource(self.model.get_resource_url_list())
         try:
-            response = resource.get(**self.query.parameters)
+            parameters = self.query.parameters
             logger.debug(u"""Requesting: "%s" through %s
                           with parameters "%s" """ % \
                 (self.model.__name__, resource.uri, parameters))
             response = resource.get(**parameters)
         except ResourceNotFound:
             return
         except Exception, e:
@@ -214,7 +222,11 @@ class RemoteQuerySet(query.QuerySet):
         resource = Resource(clone.model.get_resource_url_list())
         try:
-            response = resource.get(**clone.query.parameters)
+            parameters = clone.query.parameters
             logger.debug(u"""Counting  : "%s" through %s
                           with parameters "%s" """ % \
                 (clone.model.__name__, resource.uri, parameters))
             response = resource.get(**parameters)
         except ResourceNotFound:
             response = 0
@@ -343,7 +355,11 @@ class RemoteQuerySet(query.QuerySet):
         resource = Resource(instance.get_resource_url_detail())
         try:
-            response = resource.put(**self.query.parameters)
+            parameters = self.query.parameters
             logger.debug(u"""Adding    : "%s" for "%s"
                           with parameters "%s" """ % \
                 (objs, instance, parameters))
             response = resource.put(**parameters)
         except RequestFailed, e:
             raise ROAException(e)
@@ -358,7 +374,11 @@ class RemoteQuerySet(query.QuerySet):
         resource = Resource(instance.get_resource_url_detail())
         try:
-            response = resource.put(**self.query.parameters)
+            parameters = self.query.parameters
             logger.debug(u"""Removing  : "%s" for "%s"
                           with parameters "%s" """ % \
                 (objs, instance, parameters))
             response = resource.put(**parameters)
         except RequestFailed, e:
             raise ROAException(e)
@@ -372,7 +392,11 @@ class RemoteQuerySet(query.QuerySet):
         resource = Resource(instance.get_resource_url_detail())
         try:
-            response = resource.put(**self.query.parameters)
+            parameters = self.query.parameters
             logger.debug(u"""Clearing  : items for "%s"
                           with parameters "%s" """ % \
                 (instance, parameters))
             response = resource.put(**parameters)
         except RequestFailed, e:
             raise ROAException(e)

Up to file-list examples/django_roa_client/settings.py:

@@ -48,6 +48,7 @@ SERIALIZATION_MODULES = {
     'django' : 'examples.django_roa_client.serializers',
+}
 ## ROA custom settings
 ROA_MODELS = True   # set to False if you'd like to develop/test locally
 ROA_FORMAT = 'django' # json or xml
 ROA_DJANGO_ERRORS = True # useful to ease debugging if you use test server
@@ -66,3 +67,15 @@ ROA_MODEL_NAME_MAPPING = (
 ROA_ARGS_NAMES_MAPPING = {
     'COUNT': 'count_objects',
+}
 ## Logging settings
 import logging
 # create logger
 logger = logging.getLogger("django_roa")
 logger.setLevel(logging.DEBUG)
 # create console handler and set level to debug
 ch = logging.StreamHandler()
 ch.setLevel(logging.DEBUG)
 ch.setFormatter(logging.Formatter("%(name)s - %(message)s"))
 logger.addHandler(ch)

Up to file-list examples/django_roa_server/emitters.py:

@@ -6,7 +6,7 @@ from django.utils import simplejson
 from piston.emitters import Emitter, DjangoEmitter
-logger = logging.getLogger("django_roa_server log")
+logger = logging.getLogger("django_roa_server")
 class ROADjangoEmitter(DjangoEmitter):

Up to file-list examples/django_roa_server/handlers.py:

@@ -16,14 +16,7 @@ from django_roa_server.models import Rem
     RemotePageWithBooleanFields, RemotePageWithCustomSlug, \
     RemotePageWithOverriddenUrls, RemotePageWithRelations
 # create logger
 logger = logging.getLogger("django_roa_server log")
 logger.setLevel(logging.DEBUG)
 # create console handler and set level to debug
 ch = logging.StreamHandler()
 ch.setLevel(logging.DEBUG)
 ch.setFormatter(logging.Formatter("%(name)s - %(message)s"))
 logger.addHandler(ch)
 logger = logging.getLogger("django_roa_server")
 class ROAHandler(BaseHandler):

Up to file-list examples/django_roa_server/settings.py:

@@ -44,3 +44,14 @@ SERIALIZATION_MODULES = {
     'custom' : 'examples.django_roa_client.serializers',
+}
 PISTON_DISPLAY_ERRORS = False
 ## Logging settings
 import logging
 # create logger
 logger = logging.getLogger("django_roa_server")
 logger.setLevel(logging.DEBUG)
 # create console handler and set level to debug
 ch = logging.StreamHandler()
 ch.setLevel(logging.DEBUG)
 ch.setFormatter(logging.Formatter("%(name)s - %(message)s"))
 logger.addHandler(ch)

commit 89:	55aa123c5ab9
parent 88:	db83bd1879cd
branch:	default

david / django-roa (http://welldev.org/)