Merge branch 'master' of github.com:miLibris/flask-rest-jsonapi

Author: akira-dev

flask_rest_jsonapi/api.py

@@ -26,6 +26,9 @@ def __init__(self, app=None, blueprint=None, decorators=None):
         self.resource_registry = []
         self.decorators = decorators or tuple()
 
+        if app is not None:
+            self.init_app(app, blueprint)
+
     def init_app(self, app=None, blueprint=None):
         """Update flask application with our api
 

flask_rest_jsonapi/pagination.py

@@ -2,6 +2,7 @@
 
 """Helper to create pagination links according to jsonapi specification"""
 
+from __future__ import division
 from six.moves.urllib.parse import urlencode
 from math import ceil
 from copy import copy

tests/test_sqlalchemy_data_layer.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from six.moves.urllib.parse import urlencode
+from six.moves.urllib.parse import urlencode, parse_qs
 import pytest
 
 from sqlalchemy import create_engine, Column, Integer, DateTime, String, ForeignKey
@@ -330,10 +330,13 @@ def __init__(self, kwargs):
 
 def test_add_pagination_links(app):
     with app.app_context():
-        qs = {'page[number]': '15', 'page[size]': '10'}
+        qs = {'page[number]': '2', 'page[size]': '10'}
         qsm = QSManager(qs, None)
-        add_pagination_links(dict(), 1000, qsm, str())
-
+        pagination_dict = dict()
+        add_pagination_links(pagination_dict, 43, qsm, str())
+        last_page_dict = parse_qs(pagination_dict['links']['last'][1:])
+        assert len(last_page_dict['page[number]']) == 1
+        assert last_page_dict['page[number]'][0] == '5'
 
 def test_Node(person_model, person_schema, monkeypatch):
     from copy import deepcopy