rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed Resource to View, and allow custom root links

Browse source
This commit is contained in:
Joel Collins 2020-01-14 11:41:56 +00:00
parent 234ebc1cbb
commit a329b9197b
18 changed files with 90 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/common/flask_labthings/spec/__init__.py
View file

@ -1,4 +1,4 @@
from ..resource import Resource
from ..view import View
from apispec import APISpec
from apispec.ext.marshmallow import MarshmallowPlugin
@ -29,7 +29,7 @@ def get_spec(obj):
return obj.__apispec__
def rule2path(rule: Rule, view: Resource, spec: APISpec):
def rule2path(rule: Rule, view: View, spec: APISpec):
params = {
"path": rule_to_path(rule),
"operations": view2operations(view, spec),
@ -52,7 +52,7 @@ def rule2path(rule: Rule, view: Resource, spec: APISpec):
return params
def view2operations(view: Resource, spec: APISpec):
def view2operations(view: View, spec: APISpec):
# Operations inherit tags from parent
inherited_tags = []
if hasattr(view, "__apispec__"):
@ -60,7 +60,7 @@ def view2operations(view: Resource, spec: APISpec):
# Build dictionary of operations (HTTP methods)
ops = {}
for method in Resource.methods:
for method in View.methods:
if hasattr(view, method):
ops[method] = {}