pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new: dev: tag api view

Browse Source
This commit is contained in:
rachmadaniHaryono 2019-05-14 14:05:50 +08:00
parent 1bc4dcf0b0
commit 10a61debf8
2 changed files with 73 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
bukuserver/server.py
View File

@ -1,12 +1,14 @@
#!/usr/bin/env python
# pylint: disable=wrong-import-order, ungrouped-imports
"""Server module."""
from typing import Union
from urllib.parse import urlparse
import os
import sys
from urllib.parse import urlparse
from buku import BukuDb, __version__, network_handler
from flask.cli import FlaskGroup
from flask.views import MethodView
from flask_admin import Admin
from flask_api import exceptions, FlaskAPI, status
from flask_api.response import APIResponse
@ -66,37 +68,6 @@ def network_handle_detail():
return failed_resp
def tag_list():
tags = get_bukudb().get_tag_all()
result = {'tags': tags[0]}
return result
def tag_detail(tag):
bukudb = get_bukudb()
if request.method == 'GET':
tags = bukudb.get_tag_all()
if tag not in tags[1]:
raise exceptions.NotFound()
res = dict(name=tag, usage_count=tags[1][tag])
elif request.method == 'PUT':
res = None
try:
new_tags = request.data.get('tags')
if new_tags:
new_tags = new_tags.split(',')
else:
return response.response_template['failure'], status.HTTP_400_BAD_REQUEST
except AttributeError as e:
raise exceptions.ParseError(detail=str(e))
result_flag = bukudb.replace_tag(tag, new_tags)
if result_flag:
res = response.response_template['success'], status.HTTP_200_OK
else:
res = response.response_template['failure'], status.HTTP_400_BAD_REQUEST
return res
def update_tag(tag):
res = None
if request.method in ('PUT', 'POST'):
@ -550,29 +521,18 @@ def create_app(db_file=None):
)
# routing
# api
app.add_url_rule('/api/tags', 'get_tags', tag_list, methods=['GET'])
app.add_url_rule('/api/tags/<tag>', 'update_tag', tag_detail, methods=['GET', 'PUT'])
tag_api_view = ApiTagView.as_view('tag_api')
app.add_url_rule('/api/tags', defaults={'tag': None}, view_func=tag_api_view, methods=['GET'])
app.add_url_rule('/api/tags/<tag>', view_func=tag_api_view, methods=['GET', 'PUT'])
app.add_url_rule(
'/api/network_handle',
'networkk_handle',
'network_handle',
network_handle_detail,
methods=['POST'])
app.add_url_rule('/api/bookmarks', 'bookmarks', bookmarks, methods=['GET', 'POST', 'DELETE'])
app.add_url_rule(
'/api/bookmarks/refresh',
'refresh_bookmarks',
refresh_bookmarks,
methods=['POST'])
app.add_url_rule(
'/api/bookmarks/<id>',
'bookmark_api',
bookmark_api,
methods=['GET', 'PUT', 'DELETE'])
app.add_url_rule(
'/api/bookmarks/<id>/refresh',
'refresh_bookmark',
refresh_bookmark,
methods=['POST'])
app.add_url_rule('/api/bookmarks/<id>', 'bookmark_api', bookmark_api, methods=['GET', 'PUT', 'DELETE'])
app.add_url_rule('/api/bookmarks/refresh', 'refresh_bookmarks', refresh_bookmarks, methods=['POST'])
app.add_url_rule('/api/bookmarks/<id>/refresh', 'refresh_bookmark', refresh_bookmark, methods=['POST'])
app.add_url_rule('/api/bookmarks/<id>/tiny', 'get_tiny_url', get_tiny_url, methods=['GET'])
app.add_url_rule('/api/bookmarks/<id>/long', 'get_long_url', get_long_url, methods=['GET'])
app.add_url_rule(
@ -593,6 +553,39 @@ def create_app(db_file=None):
return app
class ApiTagView(MethodView):
def get(self, tag: Union[str, None]):
bukudb = get_bukudb()
if tag is None:
tags = bukudb.get_tag_all()
result = {'tags': tags[0]}
return result
tags = bukudb.get_tag_all()
if tag not in tags[1]:
raise exceptions.NotFound()
res = dict(name=tag, usage_count=tags[1][tag])
return res
def put(self, tag):
bukudb = get_bukudb()
res = None
try:
new_tags = request.data.get('tags')
if new_tags:
new_tags = new_tags.split(',')
else:
return response.response_template['failure'], status.HTTP_400_BAD_REQUEST
except AttributeError as e:
raise exceptions.ParseError(detail=str(e))
result_flag = bukudb.replace_tag(tag, new_tags)
if result_flag:
res = response.response_template['success'], status.HTTP_200_OK
else:
res = response.response_template['failure'], status.HTTP_400_BAD_REQUEST
return res
class CustomFlaskGroup(FlaskGroup): # pylint: disable=too-few-public-methods
def __init__(self, **kwargs):
super().__init__(**kwargs)

30
tests/test_server.py
View File

@ -60,6 +60,36 @@ def test_invalid_id(client, url, exp_res, status_code, method):
assert rd.get_json() == exp_res
def test_tag_api(client):
url = 'http://google.com'
rd = client.post('/api/bookmarks', data={'url': url, 'tags': 'tag1,tag2'})
assert rd.status_code == 200
assert rd.get_json() == {'message': 'success', 'status': 0}
rd = client.get('/api/tags')
assert rd.status_code == 200
assert rd.get_json() == {'tags': ['tag1', 'tag2']}
rd = client.get('/api/tags/tag1')
assert rd.status_code == 200
assert rd.get_json() == {'name': 'tag1', 'usage_count': 1}
rd = client.put('/api/tags/tag1', data={'tags': 'tag3,tag4'})
assert rd.status_code == 200
assert rd.get_json() == {'message': 'success', 'status': 0}
rd = client.get('/api/tags')
assert rd.status_code == 200
assert rd.get_json() == {'tags': ['tag2', 'tag3 tag4']}
rd = client.put('/api/tags/tag2', data={'tags': 'tag5'})
assert rd.status_code == 200
assert rd.get_json() == {'message': 'success', 'status': 0}
rd = client.get('/api/tags')
assert rd.status_code == 200
assert rd.get_json() == {'tags': ['tag3 tag4', 'tag5']}
rd = client.get('/api/bookmarks/1')
assert rd.status_code == 200
assert rd.get_json() == {
'description': '', 'tags': ['tag3 tag4', 'tag5'], 'title': '',
'url': 'http://google.com'}
def test_bookmark_api(client):
url = 'http://google.com'
rd = client.post('/api/bookmarks', data={'url': url})