style & pr fixes

Author: stefan-messagebird

examples/call.py

@@ -31,7 +31,13 @@
 
     # Print the object information.
     print('\nThe following information was returned as a', str(call.__class__), 'object:\n')
-    print('  '.join(str(call).splitlines(True)))
+    print('  id                : %s' % call.data.id)
+    print('  status            : %s' % call.data.status)
+    print('  source            : %s' % call.data.source)
+    print('  destination       : %s' % call.data.destination)
+    print('  createdAt         : %s' % call.data.createdAt)
+    print('  updatedAt         : %s' % call.data.updatedAt)
+    print('  endedAt           : %s' % call.data.endedAt)
 
 except messagebird.client.ErrorException as e:
     print('\nAn error occurred while requesting a Message object:\n')

examples/call_create.py

@@ -27,14 +27,13 @@
 # arguments to parse as json
 jsonArgs = ['callFlow', 'webhook']
 
-print()
 for jsonArg in jsonArgs:
     try:
         args[jsonArg] = json.loads(str(args[jsonArg]).strip('\''))
     except json.decoder.JSONDecodeError as e:
         parser.print_usage()
-        print('Invalid json provided for', jsonArg, ':', e)
-        print('Provided', jsonArg, 'json:', args[jsonArg])
+        print('Invalid json provided for %s: %s' % (jsonArg, e))
+        print('Provided %s json: %s' % (jsonArg, args[jsonArg]))
         exit(1)
 
 try:
@@ -47,6 +46,14 @@
 
     # Print the object information.
     print('\nThe following information was returned as a', str(call.__class__), 'object:\n')
+    print('  id                : %s' % call.data.id)
+    print('  status            : %s' % call.data.status)
+    print('  source            : %s' % call.data.source)
+    print('  destination       : %s' % call.data.destination)
+    print('  webhook           : %s' % call.data.webhook)
+    print('  createdAt         : %s' % call.data.createdAt)
+    print('  updatedAt         : %s' % call.data.updatedAt)
+    print('  endedAt           : %s' % call.data.endedAt)
 
 except messagebird.client.ErrorException as e:
     print('\nAn error occurred while creating a call:\n')

messagebird/call_data.py

@@ -49,8 +49,11 @@ def webhook(self, value):
     def __str__(self):
         return "\n".join([
             'id                 : %s' % self.id,
+            'status             : %s' % self.status,
+            'source             : %s' % self.source,
+            'destination        : %s' % self.destination,
+            'webhook            : %s' % self.webhook,
             'updatedAt          : %s' % self.updatedAt,
             'createdAt          : %s' % self.createdAt,
             'endedAt            : %s' % self.endedAt,
-            'webhook            : %s' % self.webhook,
         ])

messagebird/webhook.py

@@ -6,3 +6,9 @@ class Webhook(Base):
     def __init__(self):
         self.url = None
         self.token = None
+
+    def __str__(self):
+        return  "\n".join([
+            'url                : %s' % self.url,
+            'token              : %s' % self.token,
+        ])

tests/test_call.py

@@ -97,17 +97,20 @@ def test_call_create(self):
         # check all api response data is outputted
         expected_data = self.create_expected_call_data_based_on_api_response(api_response)
         response_data = call_creation_response.data.__dict__
-        self.assertEqual(expected_data, response_data, 'Check client response contains the api response data.')
+        self.assertEqual(expected_data, response_data, 'Check client response contains the API response data.')
 
         # check it can be formatted as string
         expected_call_string = 'id                 : None\n' + \
             'data.id                 : 21025ed1-cc1d-4554-ac05-043fa6c84e00\n' + \
+            'data.status             : queued\n' + \
+            'data.source             : 31644556677\n' + \
+            'data.destination        : 31612345678\n' + \
+            'data.webhook            : None\n' + \
             'data.updatedAt          : 2017-08-30 07:35:37+00:00\n' + \
             'data.createdAt          : 2017-08-30 07:35:37+00:00\n' + \
-            'data.endedAt            : None\n' + \
-            'data.webhook            : None'
+            'data.endedAt            : None'
         self.assertEqual(expected_call_string, str(call_creation_response), 'Check returned call can be formatted as' +
-                         'string')
+                         ' string')
 
     @staticmethod
     def create_expected_call_data_based_on_api_response(api_response):