Merge branch 'release-0.12.4'

Author: akira-dev

examples/api.py

@@ -11,6 +11,7 @@
 # Create the Flask application
 app = Flask(__name__)
 app.config['DEBUG'] = True
+app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
 
 # Initialize SQLAlchemy

flask_rest_jsonapi/data_layers/alchemy.py

@@ -368,9 +368,9 @@ def get_related_object(self, related_model, related_id_field, obj):
                                          .filter(getattr(related_model, related_id_field) == obj['id'])\
                                          .one()
         except NoResultFound:
-            raise RelatedObjectNotFound('', "Could not find {}.{}={} object".format(related_model.__name__,
-                                                                                    related_id_field,
-                                                                                    obj['id']))
+            raise RelatedObjectNotFound('', "{}.{}: {} not found".format(related_model.__name__,
+                                                                         related_id_field,
+                                                                         obj['id']))
 
         return related_object
 

flask_rest_jsonapi/data_layers/filtering/alchemy.py

@@ -30,13 +30,10 @@ def __init__(self, model, filter_, resource, schema):
 
     def resolve(self):
         if 'or' not in self.filter_ and 'and' not in self.filter_ and 'not' not in self.filter_:
-            if self.val is None and self.field is None:
-                raise InvalidFilters("Can't find value or field in a filter")
-
             value = self.value
 
-            if isinstance(self.val, dict):
-                value = Node(self.related_model, self.val, self.resource, self.related_schema).resolve()
+            if isinstance(value, dict):
+                value = Node(self.related_model, value, self.resource, self.related_schema).resolve()
 
             if '__' in self.filter_.get('name', ''):
                 value = {self.filter_['name'].split('__')[1]: value}
@@ -83,22 +80,6 @@ def op(self):
         except KeyError:
             raise InvalidFilters("Can't find op of a filter")
 
-    @property
-    def val(self):
-        """Return the val of the node
-
-        :return: the value to filter with
-        """
-        return self.filter_.get('val')
-
-    @property
-    def field(self):
-        """Return the field of the node
-
-        :return: the field to pick up value from to filter with
-        """
-        return self.filter_.get('field')
-
     @property
     def column(self):
         """Get the column object
@@ -114,7 +95,7 @@ def column(self):
         try:
             return getattr(self.model, model_field)
         except AttributeError:
-            raise InvalidFilters("{} has no attribute {} in a filter".format(self.model.__name__, model_field))
+            raise InvalidFilters("{} has no attribute {}".format(self.model.__name__, model_field))
 
     @property
     def operator(self):
@@ -128,21 +109,26 @@ def operator(self):
             if hasattr(self.column, op):
                 return op
 
-        raise InvalidFilters("{} has no operator {} in a filter".format(self.column.key, self.op))
+        raise InvalidFilters("{} has no operator {}".format(self.column.key, self.op))
 
     @property
     def value(self):
         """Get the value to filter on
 
         :return: the value to filter on
         """
-        if self.field is not None:
+        if self.filter_.get('field') is not None:
             try:
-                return getattr(self.model, self.field)
+                result = getattr(self.model, self.filter_['field'])
             except AttributeError:
-                raise InvalidFilters("{} has no attribute {} in a filter".format(self.model.__name__, self.field))
+                raise InvalidFilters("{} has no attribute {}".format(self.model.__name__, self.filter_['field']))
+            else:
+                return result
+        else:
+            if 'val' not in self.filter_:
+                raise InvalidFilters("Can't find value or field in a filter")
 
-        return self.val
+            return self.filter_['val']
 
     @property
     def related_model(self):

flask_rest_jsonapi/resource.py

@@ -370,12 +370,14 @@ def post(self, *args, **kwargs):
             includes.append(relationship_field)
         schema = compute_schema(self.schema, dict(), qs, includes)
 
-        status_code = 200 if updated is True else 204
+        if updated is False:
+            return '', 204
+
         result = schema.dump(obj_).data
         if result.get('links', {}).get('self') is not None:
             result['links']['self'] = request.path
         self.after_post(result)
-        return result, status_code
+        return result, 200
 
     @check_method_requirements
     def patch(self, *args, **kwargs):
@@ -416,12 +418,14 @@ def patch(self, *args, **kwargs):
             includes.append(relationship_field)
         schema = compute_schema(self.schema, dict(), qs, includes)
 
-        status_code = 200 if updated is True else 204
+        if updated is False:
+            return '', 204
+
         result = schema.dump(obj_).data
         if result.get('links', {}).get('self') is not None:
             result['links']['self'] = request.path
         self.after_patch(result)
-        return result, status_code
+        return result, 200
 
     @check_method_requirements
     def delete(self, *args, **kwargs):

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '0.12.4'
+__version__ = '0.12.5'
 
 
 setup(