diff --git a/bukuserver/server.py b/bukuserver/server.py index 453f098..93dee6b 100644 --- a/bukuserver/server.py +++ b/bukuserver/server.py @@ -62,7 +62,9 @@ def handle_network(): return failed_resp try: res = network_handler(url) - return {'title': res[0], 'recognized mime': res[1], 'bad url': res[2]} + keys = ['title', 'description', 'tags', 'recognized mime', 'bad url'] + res_dict = dict(zip(keys, res)) + return jsonify(res_dict) except Exception as e: current_app.logger.debug(str(e)) return failed_resp diff --git a/tests/test_server.py b/tests/test_server.py index 7738b14..29e98ab 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -167,13 +167,19 @@ def test_get_tiny_url(client, url, exp_res, status_code): [ dict(data={'url': 'http://google.com'}), 200, - {'bad url': None, 'recognized mime': None, 'title': 'Google'} + { + 'bad url': 0, 'description': None, + 'recognized mime': 0, 'tags': None, + 'title': 'Google'} ], [{}, 400, response_template['failure']], [ dict(data={'url': 'chrome://bookmarks/'}), 200, - {'bad url': None, 'recognized mime': None, 'title': None} + { + 'bad url': 1, 'description': None, + 'recognized mime': 0, 'tags': None, + 'title': None} ], ]) def test_network_handle(client, kwargs, status_code, exp_res):