Merge pull request ColtonProvias#33 from deryckh/revert-to-clean-state

Revert partial implementation of query params

CHANGES.md

@@ -1,10 +1,9 @@
 # SQLAlchemy-JSONAPI Changelog
 
-## 5.0.0
+## 4.0.9
 
 *Unreleased*
 
-* BREAKING: The query data is now expected for all endpoints
 * Fixed bug during testing in delete_relationship where returned resource was missing data key
 * Fixed bug during testing in patch_resource where field check was failing
 

README.md

@@ -2,8 +2,6 @@
 
 [![Build Status](https://travis-ci.org/ColtonProvias/sqlalchemy-jsonapi.svg?branch=master)](https://travis-ci.org/ColtonProvias/sqlalchemy-jsonapi)
 
-**WARNING: The master branch is currently breaking backwards compatibility and thus has been bumped to 5.0.0.  Builds are likely to fail during 5.0.0 development.**
-
 [JSON API](http://jsonapi.org/) implementation for use with
 [SQLAlchemy](http://www.sqlalchemy.org/).
 

docs/errors.rst

@@ -1,47 +1,3 @@
 ======
 Errors
-======
-
-.. currentmodule:: sqlalchemy_jsonapi.errors
-
-.. autoclass:: BaseError
-    :members:
-
-.. autoclass:: BadRequestError
-    :members:
-
-.. autoclass:: NotAnAttributeError
-    :members:
-
-.. autoclass:: NotSortableError
-    :members:
-
-.. autoclass:: PermissionDeniedError
-    :members:
-
-.. autoclass:: InvalidTypeForEndpointError
-    :members:
-
-.. autoclass:: MissingTypeError
-    :members:
-
-.. autoclass:: MissingContentTypeError
-    :members:
-
-.. autoclass:: ValidationError
-    :members:
-
-.. autoclass:: ResourceNotFoundError
-    :members:
-
-.. autoclass:: RelatedResourceNotFoundError
-    :members:
-
-.. autoclass:: RelationshipNotFoundError
-    :members:
-
-.. autoclass:: ToManyExpectedError
-    :members:
-
-.. autoclass:: ResourceTypeNotFoundError
-    :members:
+======

docs/flask.rst

@@ -2,7 +2,7 @@
 Flask
 =====
 
-.. currentmodule:: sqlalchemy_jsonapi.flaskext
+.. currentmodule:: sqlalchemy_jsonapi.flask
 
 To those who use Flask, setting up SQLAlchemy-JSONAPI can be extremely complex
 and frustrating.  Let's look at an example::

docs/index.rst

@@ -12,7 +12,6 @@ Contents:
    serializer
    flask
    errors
-   constants
 
 
 Indices and tables

docs/serializer.rst

@@ -1,8 +1,3 @@
 ==========
 Serializer
-==========
-
-.. currentmodule:: sqlalchemy_jsonapi.serializer
-
-.. autoclass:: JSONAPI
-    :members:
+==========

requirements.txt

@@ -4,6 +4,7 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
+
 bcrypt==2.0.0
 blinker==1.4
 cffi==1.7.0               # via bcrypt

setup.py

@@ -14,18 +14,14 @@
 
 from setuptools import setup
 import sys
-import ast
 
 requirements = ['SQLAlchemy', 'inflection']
 
-with open('sqlalchemy_jsonapi/_version.py', 'r') as f:
-    version = ast.parse(f.read()).body[0].value.s
-
 if sys.version_info[0] != 3 or sys.version_info[1] < 4:
-    requirements.append('enum34')
+      requirements.append('enum34')
 
 setup(name='SQLAlchemy-JSONAPI',
-      version=version,
+      version='4.0.9',
       url='http://github.com/coltonprovias/sqlalchemy-jsonapi',
       license='MIT',
       author='Colton J. Provias',

sqlalchemy_jsonapi/__init__.py

@@ -3,9 +3,8 @@
                          AttributeActions, Permissions, RelationshipActions,
                          attr_descriptor, permission_test,
                          relationship_descriptor)
-from ._version import __version__
 
 try:
     from .flaskext import FlaskJSONAPI
 except ImportError:
-    FlaskJSONAPI = None
+    FlaskJSONAPI = None

sqlalchemy_jsonapi/constants.py

@@ -5,6 +5,7 @@
 MIT License
 """
 
+
 try:
     from enum import Enum
 except ImportError:
@@ -26,4 +27,4 @@ class Endpoint(Enum):
     COLLECTION = '/<api_type>'
     RESOURCE = '/<api_type>/<obj_id>'
     RELATED = '/<api_type>/<obj_id>/<relationship>'
-    RELATIONSHIP = '/<api_type>/<obj_id>/relationships/<relationship>'
+    RELATIONSHIP = '/<api_type>/<obj_id>/relationships/<relationship>'

sqlalchemy_jsonapi/flaskext.py

@@ -163,11 +163,7 @@ def _setup_adapter(self, namespace, route_prefix):
         :param namespace: Prefix for generated endpoints
         :param route_prefix: Prefix for route patterns
         """
-        self.serializer = JSONAPI(self.sqla.Model,
-                                  prefix='{}://{}{}'.format(
-                                      self.app.config['PREFERRED_URL_SCHEME'],
-                                      self.app.config['SERVER_NAME'],
-                                      route_prefix))
+        self.serializer = JSONAPI(self.sqla.Model, prefix='{}://{}{}'.format(self.app.config['PREFERRED_URL_SCHEME'], self.app.config['SERVER_NAME'], route_prefix))
         for view in views:
             method, endpoint = view
             pattern = route_prefix + endpoint.value
@@ -224,8 +220,8 @@ def new_view(**kwargs):
             try:
                 attr = '{}_{}'.format(method.name, endpoint.name).lower()
                 handler = getattr(self.serializer, attr)
-                handler_chain = list(self._handler_chains.get((kwargs[
-                    'api_type'], method, endpoint), []))
+                handler_chain = list(self._handler_chains.get((
+                    kwargs['api_type'], method, endpoint), []))
                 handler_chain.append(handler)
                 chained_handler = self._call_next(handler_chain)
                 response = chained_handler(*args)