Merge branch 'release/0.8.0'

ChangeLog

@@ -0,0 +1,5 @@
+2015-03-26  Kirill Pavlov <kirill.pavlov@phystech.edu>
+
+	* Version 0.8.0, update document primary information key. Use 'data'
+	instead of Resource's plural name. It reflects standard change at
+	2015-03-16 (Release candidate 3).

jsonapi/__init__.py

@@ -1,5 +1,5 @@
 """ JSON:API realization."""
-__version = (0, 7, 4)
+__version = (0, 8, 0)
 
 __version__ = version = '.'.join(map(str, __version))
 __project__ = PROJECT = __name__

jsonapi/api.py

@@ -234,6 +234,12 @@ def handler_view_put(self, resource, **kwargs):
 
         try:
             data = resource.put(**kwargs)
+            if "errors" in data:
+                response = HttpResponse(
+                    json.dumps(data, cls=DatetimeDecimalEncoder),
+                    content_type=self.CONTENT_TYPE, status=400)
+                return response
+
             response = HttpResponse(
                 json.dumps(data, cls=DatetimeDecimalEncoder),
                 content_type=self.CONTENT_TYPE, status=200)

jsonapi/resource.py

@@ -394,16 +394,26 @@ def put(cls, request=None, **kwargs):
             )
             raise JSONAPIError(statuses.HTTP_403_FORBIDDEN, msg)
 
-        objects = []
+        forms = []
         for item in items:
             if 'links' in item:
                 item.update(item.pop('links'))
             Form = cls.Meta.form or cls.get_form(item.keys())
             instance = objects_map[item["id"]]
             form = Form(item, instance=instance)
-            objects.append(form.save())
+            forms.append(form)
 
-        data = [cls.dump_document(o) for o in objects]
+            if not form.is_valid():
+                response = {
+                    "errors": [{
+                        "status": 400,
+                        "title": "Validation Error",
+                        "data": form.errors
+                    }]
+                }
+                return response
+
+        data = [cls.dump_document(f.save()) for f in forms]
 
         if not is_collection:
             data = data[0]

tests/testapp/tests/test_api.py

@@ -312,6 +312,29 @@ def test_create_model_validation_error(self):
         data = json.loads(response.content.decode("utf-8"))
         self.assertEqual(data, expected_data)
 
+        response = self.client.post(
+            '/api/post',
+            json.dumps({
+                "data": {
+                    "title": "New Post"
+                },
+            }),
+            content_type='application/vnd.api+json',
+            HTTP_ACCEPT='application/vnd.api+json'
+        )
+        self.assertEqual(response.status_code, 400)
+
+        expected_data = {
+            "errors": [{
+                "status": 400,
+                "title": "Validation Error",
+                "data": {'author': ['This field is required.']},
+            }]
+        }
+
+        data = json.loads(response.content.decode("utf-8"))
+        self.assertEqual(data, expected_data)
+
     def test_update_model(self):
         author = mixer.blend("testapp.author", name="")
         response = self.client.put(
@@ -429,6 +452,33 @@ def test_update_model_authentication(self):
         user = User.objects.get(id=self.user.id)
         self.assertEqual(user.email, "email@example.com")
 
+    def test_update_model_validation_error(self):
+        author = mixer.blend('testapp.author')
+        response = self.client.put(
+            '/api/author/{}'.format(author.id),
+            json.dumps({
+                "data": {
+                    "id": author.id,
+                    "name": "a" * 101,
+                },
+            }),
+            content_type='application/vnd.api+json',
+            HTTP_ACCEPT='application/vnd.api+json'
+        )
+        self.assertEqual(response.status_code, 400)
+
+        expected_data = {
+            "errors": [{
+                "status": 400,
+                "title": "Validation Error",
+                "data": {'name': ['Ensure this value has at most 100 ' +
+                                  'characters (it has 101).']},
+            }]
+        }
+
+        data = json.loads(response.content.decode("utf-8"))
+        self.assertEqual(data, expected_data)
+
     def test_delete_model(self):
         author = mixer.blend("testapp.author")
         response = self.client.delete(