From: Joar Wandborg <git@wandborg.com>
Date: Sat, 15 Sep 2012 13:54:22 +0000 (+0200)
Subject: Added fields to /api/entries, wrote docstrings for api.tools
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=85726f7360e2a7dbc74764c26501ac633bc10049;p=mediagoblin.git

Added fields to /api/entries, wrote docstrings for api.tools
---

diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py
index 4d306274..e3b15b23 100644
--- a/mediagoblin/plugins/api/tools.py
+++ b/mediagoblin/plugins/api/tools.py
@@ -51,16 +51,37 @@ class Auth(object):
         raise NotImplemented()
 
 
-def json_response(serializable):
-    response = Response(json.dumps(serializable))
+def json_response(serializable, *args, **kw):
+    '''
+    Serializes a json objects and returns a webob.Response object with the
+    serialized value as the response body and Content-Type: application/json.
+
+    :param serializable: A json-serializable object
+
+    Any extra arguments and keyword arguments are passed to the
+    webob.Response.__init__ method.
+    '''
+    response = Response(json.dumps(serializable), *args, **kw)
     response.headers['Content-Type'] = 'application/json'
     return response
 
 
-def get_entry_serializable(entry):
+def get_entry_serializable(entry, urlgen):
+    '''
+    Returns a serializable dict() of a MediaEntry instance.
+
+    :param entry: A MediaEntry instance
+    :param urlgen: An urlgen instance, can be found on the request object passed
+    to views.
+    '''
     return {
             'user': entry.get_uploader.username,
             'user_id': entry.get_uploader.id,
+            'user_bio': entry.get_uploader.bio,
+            'user_bio_html': entry.get_uploader.bio_html,
+            'user_permalink': urlgen('mediagoblin.user_pages.user_home',
+                user=entry.get_uploader.username,
+                qualified=True),
             'id': entry.id,
             'created': entry.created.isoformat(),
             'title': entry.title,
@@ -68,10 +89,18 @@ def get_entry_serializable(entry):
             'description': entry.description,
             'description_html': entry.description_html,
             'media_type': entry.media_type,
-            'media_files': get_media_file_paths(entry.media_files)}
+            'permalink': entry.url_for_self(urlgen, qualified=True),
+            'media_files': get_media_file_paths(entry.media_files, urlgen)}
+
 
+def get_media_file_paths(media_files, urlgen):
+    '''
+    Returns a dictionary of media files with `file_handle` => `qualified URL`
 
-def get_media_file_paths(media_files):
+    :param media_files: dict-like object consisting of `file_handle => `listy
+    filepath` pairs.
+    :param urlgen: An urlgen object, usually found on request.urlgen.
+    '''
     if isinstance(mg_globals.public_store, BasicFileStorage):
         pass  # TODO
 
@@ -84,6 +113,11 @@ def get_media_file_paths(media_files):
 
 
 def api_auth(controller):
+    '''
+    Decorator, allows plugins to register auth methods that will then be
+    evaluated against the request, finally a worthy authenticator object is
+    chosen and used to decide whether to grant or deny access.
+    '''
     @wraps(controller)
     def wrapper(request, *args, **kw):
         auth_candidates = []
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py
index 49c16ee6..feeac09a 100644
--- a/mediagoblin/plugins/api/views.py
+++ b/mediagoblin/plugins/api/views.py
@@ -41,6 +41,6 @@ def get_entries(request):
     entries_serializable = []
 
     for entry in entries:
-        entries_serializable.append(get_entry_serializable(entry))
+        entries_serializable.append(get_entry_serializable(entry, request.urlgen))
 
     return json_response(entries_serializable)