Merge pull request #100 from greut/nested

Add support for nested structure, e.g. attachments

Author: Yasumoto

README.md

@@ -43,7 +43,8 @@ print sc.api_call("api.test")
 print sc.api_call("channels.info", channel="1234567890")
 print sc.api_call(
     "chat.postMessage", channel="#general", text="Hello from Python! :tada:",
-    username='pybot', icon_emoji=':robot_face:'
+    username='pybot', icon_emoji=':robot_face:',
+    attachments=[{'title': 'This is an attachment', 'color': 'good'}]
 )
 ```
 

requirements-dev.txt

@@ -3,6 +3,7 @@ ipdb==0.9.3
 ipython==4.1.2
 pdbpp==0.8.3
 pytest>=2.8.2
+pytest-mock>=1.1
 pytest-cov==2.2.1
 pytest-pythonpath>=0.3
 testfixtures==4.9.1

requirements.txt

@@ -1,2 +1,3 @@
 future==0.15.2
+six==1.10.0
 websocket-client==0.35.0

setup.py

@@ -11,5 +11,6 @@
       install_requires=[
         'websocket-client',
         'requests',
+        'six',
       ],
       zip_safe=False)

slackclient/_slackrequest.py

@@ -1,12 +1,21 @@
+import json
+
 import requests
+import six
 
 
 class SlackRequest(object):
 
     @staticmethod
     def do(token, request="?", post_data=None, domain="slack.com"):
         post_data = post_data or {}
-        return requests.post(
-            'https://{0}/api/{1}'.format(domain, request),
-            data=dict(post_data, token=token),
-        )
+
+        for k, v in six.iteritems(post_data):
+            if not isinstance(v, six.string_types):
+                post_data[k] = json.dumps(v)
+
+        url = 'https://{0}/api/{1}'.format(domain, request)
+        post_data['token'] = token
+        files = {'file': post_data.pop('file')} if 'file' in post_data else None
+
+        return requests.post(url, data=post_data, files=files)

tests/test_slackrequest.py

@@ -0,0 +1,17 @@
+from slackclient._slackrequest import SlackRequest
+import json
+
+
+def test_post_attachements(mocker):
+    requests = mocker.patch('slackclient._slackrequest.requests')
+
+    SlackRequest.do('xoxb-123',
+                    'chat.postMessage',
+                    {'attachments': [{'title': 'hello'}]})
+
+    assert requests.post.call_count == 1
+    args, kwargs = requests.post.call_args
+    assert 'https://slack.com/api/chat.postMessage' == args[0]
+    assert {'attachments': json.dumps([{'title': 'hello'}]),
+            'token': 'xoxb-123'} == kwargs['data']
+    assert None == kwargs['files']