expand_json utility... yet another convenience function :)

This commit sponsored by Benjamin Lebsanft.  Thank you!

diff --git a/mediagoblin/tools/metadata.py b/mediagoblin/tools/metadata.py
index 37d04fa11cb3470de7549a59972b8aff36134bab..dde5753efec61ac94c5cfc985d5211f4877858a2 100644 (file)
--- a/mediagoblin/tools/metadata.py
+++ b/mediagoblin/tools/metadata.py
@@ -183,3 +183,18 @@ def compact_and_validate(metadata, context=DEFAULT_CONTEXT,
     return compacted
 
 
+def expand_json(metadata, context=DEFAULT_CONTEXT):
+    """
+    Expand json, but be sure to use our documentLoader.
+
+    By default this expands with DEFAULT_CONTEXT, but if you do not need this,
+    you can safely set this to None.
+
+    # @@: Is the above a good idea?  Maybe it should be set to None by
+    #   default.
+    """
+    options = {
+        "documentLoader": load_context}
+    if context is not None:
+        options["expandContext"] = context
+    return jsonld.expand(metadata, options=options)