Support for file arguments in command line client

tomchristie · tomchristie · commit de0dfe01ea4a · 2016-02-11T12:09:53.000Z
diff --git a/coreapi/codecs/jsondata.py b/coreapi/codecs/jsondata.py
@@ -1,6 +1,7 @@
 # coding: utf-8
 from coreapi.codecs.base import BaseCodec
 from coreapi.exceptions import ParseError
+import collections
 import json
 
 
@@ -12,6 +13,6 @@ def load(self, bytes, base_url=None):
         Return raw JSON data.
         """
         try:
-            return json.loads(bytes.decode('utf-8'))
+            return json.loads(bytes.decode('utf-8'), object_pairs_hook=collections.OrderedDict)
         except ValueError as exc:
             raise ParseError('Malformed JSON. %s' % exc)
diff --git a/coreapi/commandline.py b/coreapi/commandline.py
@@ -206,32 +206,33 @@ def show(path):
     click.echo(display(doc))
 
 
-def validate_params(ctx, param, value):
-    if any(['=' not in item for item in value]):
-        raise click.BadParameter('Parameters need to be in format <field name>=<value>')
-
-    # Convert to dict.
-    params = dict([tuple(item.split('=', 1)) for item in value])
+def parse_json(ctx, param, value):
+    ret = []
 
-    # Gracefully handle non-string values.
-    # Eg treat "-p complete=true" as {"complete": True}
-    for key, value in params.items():
+    for field, data in value:
         try:
-            value = json.loads(value)
+            pair = (field, json.loads(data))
         except:
-            pass
-        else:
-            params[key] = value
+            raise click.BadParameter('Invalid JSON for data argument "%s"' % field)
+        ret.append(pair)
 
-    return params
+    return ret
 
 
-@click.command(help='Interact with the active document.\n\nRequires a PATH to a link in the document.')
+@click.command(help='Interact with the active document.\n\nRequires a PATH to a link in the document.\n\nExample:\n\ncoreapi action users add_user --str username tom --data is_admin true')
 @click.argument('path', nargs=-1)
-@click.option('--param', '-p', multiple=True, callback=validate_params, help='Parameter in the form <field name>=<value>.')
-@click.option('--action', '-a', help='Set the link action explicitly.', default=None)
-@click.option('--transform', '-t', help='Set the linke transform explicitly.', default=None)
-def action(path, param, action, transform):
+@click.option('strings', '--str', '-s', type=(unicode, unicode), multiple=True, metavar="FIELD STRING", help='String parameter for the action.')
+@click.option('data', '--data', '-d', type=(unicode, unicode), multiple=True, callback=parse_json, metavar="FIELD DATA", help='Data parameter for the action.')
+@click.option('files', '--file', '-f', type=(unicode, click.File('rb')), multiple=True, metavar="FIELD FILENAME", help='File parameter for the action.')
+@click.option('--action', '-a', metavar="ACTION", help='Set the link action explicitly.', default=None)
+@click.option('--encoding', '-e', metavar="ENCODING", help='Set the link encoding explicitly.', default=None)
+@click.option('--transform', '-t', metavar="TRANSFORM", help='Set the link transform explicitly.', default=None)
+def action(path, strings, data, files, action, encoding, transform):
+    params = {}
+    params.update(dict(strings))
+    params.update(dict(data))
+    params.update(dict(files))
+
     if not path:
         click.echo('Missing PATH to a link in the document.')
         sys.exit(1)
@@ -245,7 +246,10 @@ def action(path, param, action, transform):
     history = get_history()
     keys = coerce_key_types(doc, path)
     try:
-        doc = client.action(doc, keys, params=param, action=action, transform=transform)
+        doc = client.action(
+            doc, keys, params=params,
+            action=action, encoding=encoding, transform=transform
+        )
     except coreapi.exceptions.ErrorMessage as exc:
         click.echo(display(exc.error))
         sys.exit(1)
diff --git a/coreapi/transports/http.py b/coreapi/transports/http.py
@@ -25,7 +25,7 @@ def _get_method(action):
 
 def _get_params(method, fields, params=None):
     """
-    Separate the params into their location types: path, query, or form.
+    Separate the params into their location types.
     """
     if params is None:
         return empty_params
@@ -117,11 +117,11 @@ def _get_content_type(file_obj):
     """
     When a raw file upload is made, determine a content-type where possible.
     """
-    content_type = getattr(file_obj, 'content_type')
-    if content_type is None:
-        name = getattr(file_obj, 'name')
-        if name is not None:
-            content_type, encoding = mimetypes.guess_type(name)
+    name = getattr(file_obj, 'name', None)
+    if name is not None:
+        content_type, encoding = mimetypes.guess_type(name)
+    else:
+        content_type = None
     return content_type
 
 
