Merge pull request #1 from miLibris/master

merge fix

Author: James Albert

flask_rest_jsonapi/data_layers/base.py

@@ -30,14 +30,15 @@ def __init__(self, kwargs):
 
         :param dict kwargs: information about data layer instance
         """
+        if kwargs.get('methods') is not None:
+            self.bound_additional_methods(kwargs['methods'])
+            kwargs.pop('methods')
+
         kwargs.pop('class', None)
 
         for key, value in kwargs.items():
             setattr(self, key, value)
 
-        if kwargs.get('methods') is not None:
-            self.bound_additional_methods()
-
     def create_object(self, data, view_kwargs):
         """Create an object
 
@@ -310,10 +311,11 @@ def after_delete_relationship(self, obj, updated, json_data, relationship_field,
         """
         raise NotImplementedError
 
-    def bound_additional_methods(self):
+    def bound_additional_methods(self, methods):
         """Bound additional methods to current instance
 
         :param class meta: information from Meta class used to configure the data layer instance
         """
-        for key, value in self.methods.items():
-            setattr(self, key, types.MethodType(value, self))
+        for key, value in methods.items():
+            if key in self.ADDITIONAL_METHODS:
+                setattr(self, key, types.MethodType(value, self))

flask_rest_jsonapi/data_layers/filtering/alchemy.py

@@ -29,7 +29,7 @@ def __init__(self, model, filter_, resource, schema):
         self.schema = schema
 
     def resolve(self):
-        if 'or' not in self.filter_ and 'and' not in self.filter_:
+        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")
 

flask_rest_jsonapi/resource.py

@@ -32,7 +32,8 @@ def __new__(cls):
                                 .format(cls.__name__))
 
             data_layer_cls = cls.data_layer.get('class', SqlalchemyDataLayer)
-            cls._data_layer = data_layer_cls(cls.data_layer)
+            data_layer_kwargs = copy(cls.data_layer)
+            cls._data_layer = data_layer_cls(data_layer_kwargs)
             cls._data_layer.resource = cls
 
         for method in getattr(cls, 'methods', ('GET', 'POST', 'PATCH', 'DELETE')):

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '0.11.3'
+__version__ = '0.11.4'
 
 
 setup(