Rest create with ObjectRequest - to be tested

diff --git a/rest/__init__.py b/rest/__init__.py
index 7276d78..b480e99 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -101,10 +101,24 @@ class ObjectRequest(object):
         
         query = self.applyFilters(query)
         return execute_query(self.request, query)
-    
+
+    def create(self):
+        query = Query.create(self.type)
+        # No filters for create
+        if self.params :
+            query.set(self.params)
+        else:
+            raise Exception, "Params are required for create"
+        return execute_query(self.request, query)
+   
     def update(self):
         query = Query.update(self.type)
         query = self.applyFilters(query, True)
+        if self.filters :
+            query.set(self.filters)
+        else:
+            raise Exception, "Filters are required for update"
+
         if self.params :
             query.set(self.params)
         else:
@@ -117,7 +131,7 @@ class ObjectRequest(object):
         if self.filters :
             query.set(self.filters)
         else:
-            raise Exception, "Params are required for update"
+            raise Exception, "Filters are required for update"
         return execute_query(self.request, query)
     
     def json(self):

diff --git a/rest/create.py b/rest/create.py
index eaad539..e95a6e7 100644 (file)
--- a/rest/create.py
+++ b/rest/create.py
@@ -1,5 +1,3 @@
-from manifold.core.query            import Query
-
 from django.views.generic.base      import TemplateView
 from django.shortcuts               import render_to_response
 
@@ -9,60 +7,42 @@ from django.http                    import HttpResponse
 from manifold.core.query            import Query, AnalyzedQuery
 from manifoldapi.manifoldapi        import execute_query
 
-from string import join
-import decimal
-import datetime
-import json
+from rest import ObjectRequest, error, success
 
-# handles serialization of datetime in json
-DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None
+from string import join
 
-# support converting decimal in json
-json.encoder.FLOAT_REPR = lambda o: format(o, '.2f')
+import json
 
-# handles decimal numbers serialization in json
-class DecimalEncoder(json.JSONEncoder):
-    def _iterencode(self, o, markers=None):
-        if isinstance(o, decimal.Decimal):
-            return (str(o) for o in [o])
-        return super(DecimalEncoder, self)._iterencode(o, markers)
 
 def dispatch(request, object_type, object_name):
     
-    object_filters = {}
-    object_params = {}
-    result = {}
+    o = ObjectRequest(request, object_type, object_name)    
     
     if request.method == 'POST':
-        req_items = request.POST.items()
+        req_items = request.POST
     elif request.method == 'GET':
-        return HttpResponse(json.dumps({'error' : 'only post request is supported'}), content_type="application/json")
-
-    query = Query.create(object_type)
+        #return error('only post request is supported')
+        req_items = request.GET
+    print req_items
+    for el in req_items.items():
+        # Filters not used for create
+        if el[0].startswith('filters'):
+            o.filters[el[0][8:-1]] = el[1]
+        elif el[0].startswith('params'):
+            o.params[el[0][7:-1]] = el[1]
+        elif el[0].startswith('fields'):
+            o.fields=req_items.getlist('fields[]')
+        elif el[0].startswith('options'):
+            o.options = req_items.getlist('options[]')
+
+    try:
+        response = o.create()
+
+        if response :
+            return success('record created')
+        else :
+            return error('an error has occurred')
+ 
+    except Exception, e:
+        return error(str(e))
 
-# No filters for create    
-#    if object_filters :
-#        for k, f in object_filters.iteritems() :
-#            query.filter_by(k, '==', f)
-#    
-#    # DEBUG        
-#    print object_filters
-    
-    if object_params :
-        query.set(object_params.iteritems())
-    else :
-        return HttpResponse(json.dumps({'error' : 'params are required for create'}), content_type="application/json")
-    
-    # DEBUG
-    print object_params
-    
-    result = execute_query(request, query)
-    
-    # DEBUG
-    print result
-    
-    if result :
-        return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
-    else :
-        return HttpResponse(json.dumps({'success' : 'record updated'}), content_type="application/json")
-    

diff --git a/rest/update.py b/rest/update.py
index 119c468..9657976 100644 (file)
--- a/rest/update.py
+++ b/rest/update.py
@@ -23,21 +23,17 @@ def dispatch(request, object_type, object_name):
     elif request.method == 'GET':
         #return error('only post request is supported')
         req_items = request.GET
-    print req_items
     for el in req_items.items():
         if el[0].startswith('filters'):
             o.filters[el[0][8:-1]] = el[1]
-            print o.filters
         elif el[0].startswith('params'):
             o.params[el[0][7:-1]] = el[1]
-            print o.params
         elif el[0].startswith('fields'):
             o.fields=req_items.getlist('fields[]')
         elif el[0].startswith('options'):
             o.options = req_items.getlist('options[]')
 
     try:
-        print o.params
         response = o.update()
 
         if response :