heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Add test for API object endpoint

Browse Source
This commit is contained in:
Jessica Tallon
2014-07-12 08:42:39 +01:00
parent 51ab51921e
commit 3c8bd177b2
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/federation/routing.py
View File

@@ -51,7 +51,7 @@ add_route(
# object endpoints
add_route(
"mediagoblin.federation.object",
"/api/<string:objectType>/<string:uuid>",
"/api/<string:objectType>/<string:slug>",
"mediagoblin.federation.views:object"
)
add_route(

6
mediagoblin/federation/views.py
View File

@@ -275,16 +275,16 @@ def feed(request):
def object(request, raw_obj=False):
""" Lookup for a object type """
object_type = request.matchdict["objectType"]
uuid = request.matchdict["uuid"]
slug = request.matchdict["slug"]
if object_type not in ["image"]:
error = "Unknown type: {0}".format(object_type)
# not sure why this is 404, maybe ask evan. Maybe 400?
return json_response({"error": error}, status=404)
media = MediaEntry.query.filter_by(slug=uuid).first()
media = MediaEntry.query.filter_by(slug=slug).first()
if media is None:
# no media found with that uuid
error = "Can't find a {0} with ID = {1}".format(object_type, uuid)
error = "Can't find a {0} with ID = {1}".format(object_type, slug)
return json_response({"error": error}, status=404)
if raw_obj: