Merge branch 'hotfix-0.12.1' into develop

Author: akira-dev

Diff for: docs/index.rst

@@ -29,8 +29,8 @@ Flask-REST-JSONAPI has lot of features:
 * Sparse fieldsets
 * Pagination
 * Sorting
-* OAuth
 * Permission management
+* OAuth support
 
 
 User's Guide

Diff for: docs/oauth.rst

@@ -45,7 +45,7 @@ Example ::
 
 If you want to customize the scope you can provide a function that computes your custom scope. The function have to looks like that:
 
-    .. code-block:: python
+.. code-block:: python
 
     def get_scope(resource, method):
             """Compute the name of the scope for oauth
@@ -80,7 +80,7 @@ If you want to disable OAuth or make custom methods protection for a resource yo
 
 Example:
 
-    .. code-block:: python
+.. code-block:: python
 
     from flask_rest_jsonapi import ResourceList
     from your_project.extensions import oauth2

Diff for: docs/permission.rst

@@ -43,7 +43,7 @@ The permission manager must be a function that looks like this:
 
 If permission is denied I recommand to raise exception like that:
 
-    .. code-block:: python
+.. code-block:: python
 
     raise JsonApiException(<error_source>,
                            <error_details>,
@@ -52,7 +52,7 @@ If permission is denied I recommand to raise exception like that:
 
 You can disable the permission system or make custom permission checking management of a resource like that:
 
-    .. code-block:: python
+.. code-block:: python
 
     from flask_rest_jsonapi import ResourceList
     from your_project.extensions import api

Diff for: flask_rest_jsonapi/data_layers/alchemy.py

@@ -8,7 +8,7 @@
 from flask_rest_jsonapi.constants import DEFAULT_PAGE_SIZE
 from flask_rest_jsonapi.data_layers.base import BaseDataLayer
 from flask_rest_jsonapi.exceptions import RelationNotFound, RelatedObjectNotFound, JsonApiException,\
-    InvalidSort
+    InvalidSort, ObjectNotFound
 from flask_rest_jsonapi.data_layers.filtering.alchemy import create_filters
 from flask_rest_jsonapi.schema import get_relationships
 
@@ -110,6 +110,12 @@ def update_object(self, obj, data, view_kwargs):
         :param dict view_kwargs: kwargs from the resource view
         :return boolean: True if object have changed else False
         """
+        if obj is None:
+            url_field = getattr(self, 'url_field', 'id')
+            filter_value = view_kwargs[url_field]
+            raise ObjectNotFound({'parameter': url_field},
+                                 '{}: {} not found'.format(self.model.__class__.__name__, filter_value))
+
         self.before_update_object(obj, data, view_kwargs)
 
         relationship_fields = get_relationships(self.resource.schema)
@@ -133,6 +139,12 @@ def delete_object(self, obj, view_kwargs):
         :param DeclarativeMeta item: an item from sqlalchemy
         :param dict view_kwargs: kwargs from the resource view
         """
+        if obj is None:
+            url_field = getattr(self, 'url_field', 'id')
+            filter_value = view_kwargs[url_field]
+            raise ObjectNotFound({'parameter': url_field},
+                                 '{}: {} not found'.format(self.model.__class__.__name__, filter_value))
+
         self.before_delete_object(obj, view_kwargs)
 
         self.session.delete(obj)
@@ -157,6 +169,12 @@ def create_relationship(self, json_data, relationship_field, related_id_field, v
 
         obj = self.get_object(view_kwargs)
 
+        if obj is None:
+            url_field = getattr(self, 'url_field', 'id')
+            filter_value = view_kwargs[url_field]
+            raise ObjectNotFound({'parameter': url_field},
+                                 '{}: {} not found'.format(self.model.__class__.__name__, filter_value))
+
         if not hasattr(obj, relationship_field):
             raise RelationNotFound('', "{} has no attribute {}".format(obj.__class__.__name__, relationship_field))
 
@@ -207,6 +225,12 @@ def get_relationship(self, relationship_field, related_type_, related_id_field,
 
         obj = self.get_object(view_kwargs)
 
+        if obj is None:
+            url_field = getattr(self, 'url_field', 'id')
+            filter_value = view_kwargs[url_field]
+            raise ObjectNotFound({'parameter': url_field},
+                                 '{}: {} not found'.format(self.model.__class__.__name__, filter_value))
+
         if not hasattr(obj, relationship_field):
             raise RelationNotFound('', "{} has no attribute {}".format(obj.__class__.__name__, relationship_field))
 
@@ -237,6 +261,12 @@ def update_relationship(self, json_data, relationship_field, related_id_field, v
 
         obj = self.get_object(view_kwargs)
 
+        if obj is None:
+            url_field = getattr(self, 'url_field', 'id')
+            filter_value = view_kwargs[url_field]
+            raise ObjectNotFound({'parameter': url_field},
+                                 '{}: {} not found'.format(self.model.__class__.__name__, filter_value))
+
         if not hasattr(obj, relationship_field):
             raise RelationNotFound('', "{} has no attribute {}".format(obj.__class__.__name__, relationship_field))
 
@@ -290,6 +320,12 @@ def delete_relationship(self, json_data, relationship_field, related_id_field, v
 
         obj = self.get_object(view_kwargs)
 
+        if obj is None:
+            url_field = getattr(self, 'url_field', 'id')
+            filter_value = view_kwargs[url_field]
+            raise ObjectNotFound({'parameter': url_field},
+                                 '{}: {} not found'.format(self.model.__class__.__name__, filter_value))
+
         if not hasattr(obj, relationship_field):
             raise RelationNotFound('', "{} has no attribute {}".format(obj.__class__.__name__, relationship_field))
 

Diff for: flask_rest_jsonapi/exceptions.py

@@ -3,7 +3,7 @@
 
 class JsonApiException(Exception):
 
-    title = 'Unknow error'
+    title = 'Unknown error'
     status = 500
 
     def __init__(self, source, detail, title=None, status=None):

Diff for: setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '0.12.0'
+__version__ = '0.12.1'
 
 
 setup(

Diff for: tests/test_sqlalchemy_data_layer.py

@@ -19,7 +19,6 @@
 from flask_rest_jsonapi.data_layers.alchemy import SqlalchemyDataLayer
 from flask_rest_jsonapi.data_layers.base import BaseDataLayer
 from flask_rest_jsonapi.data_layers.filtering.alchemy import Node
-from flask_rest_jsonapi.schema import get_relationships
 import flask_rest_jsonapi.decorators
 import flask_rest_jsonapi.resource
 import flask_rest_jsonapi.schema
@@ -297,7 +296,7 @@ def api_blueprint(client):
 def register_routes(client, app, api_blueprint, person_list, person_detail, person_computers,
                     person_list_raise_jsonapiexception, person_list_raise_exception, person_list_response,
                     person_list_without_schema, computer_list, computer_detail, computer_owner):
-    api = Api(api_blueprint)
+    api = Api(blueprint=api_blueprint)
     api.route(person_list, 'person_list', '/persons')
     api.route(person_detail, 'person_detail', '/persons/<int:person_id>')
     api.route(person_computers, 'person_computers', '/persons/<int:person_id>/relationships/computers')
@@ -423,12 +422,8 @@ def test_compute_schema(person_schema):
     query_string = {'page[number]': '3', 'fields[person]': list()}
     qsm = QSManager(query_string, person_schema)
     with pytest.raises(InvalidInclude):
-        flask_rest_jsonapi.schema.compute_schema(
-            person_schema, dict(), qsm, ['id']
-        )
-    s = flask_rest_jsonapi.schema.compute_schema(
-        person_schema, dict(only=list()), qsm, list()
-    )
+        flask_rest_jsonapi.schema.compute_schema(person_schema, dict(), qsm, ['id'])
+    flask_rest_jsonapi.schema.compute_schema(person_schema, dict(only=list()), qsm, list())
 
 
 # test good cases
@@ -919,6 +914,7 @@ def commit_mock():
 def test_sqlalchemy_data_layer_delete_object_error(session, person_model, person_list, monkeypatch):
     def commit_mock():
         raise JsonApiException()
+
     def delete_mock(obj):
         pass
     with pytest.raises(JsonApiException):
@@ -1520,5 +1516,5 @@ def test_api(app, person_list):
 
 def test_api_resources(app, person_list):
     api = Api()
-    api.route(person_list, 'person_list', '/persons', '/person_list')
+    api.route(person_list, 'person_list2', '/persons', '/person_list')
     api.init_app(app)