[DEVX-5241] Add last_request and last_response to client. (#382)

* [DEVX-5241] Add last_request and last_response to client.

* [DEVX-5241]  Add tests for last_request and last_response.

* [DEVX-5241] Setting last_request before the request is sent just in case.

* last_response and last_request are Twilio objects, tests to assert proper contructions and setting none on request exception

Author: jmctwilio

tests/unit/http/test_http_client.py

@@ -14,7 +14,6 @@
 
 
 class TestHttpClientRequest(unittest.TestCase):
-
     def setUp(self):
         self.session_patcher = patch('twilio.http.http_client.Session')
 
@@ -40,6 +39,8 @@ def test_request_sets_host_header_if_missing(self):
         self.client.request('doesnt matter', 'doesnt matter')
 
         self.assertEqual('other.twilio.com', self.request_mock.headers['Host'])
+        self.assertIsNotNone(self.client.last_request)
+        self.assertIsNotNone(self.client.last_response)
 
     def test_request_with_unicode_response(self):
         self.request_mock.url = 'https://api.twilio.com/'
@@ -51,6 +52,38 @@ def test_request_with_unicode_response(self):
         self.assertEqual(200, response.status_code)
         self.assertEqual('testing-unicode: Ω≈ç√, 💩', response.content)
 
+    def test_last_request_last_response_exist(self):
+        self.request_mock.url = 'https://api.twilio.com/'
+        self.request_mock.headers = {'Host': 'other.twilio.com'}
+
+        self.client.request('doesnt-matter-method',
+                            'doesnt-matter-url',
+                            {'params-value': 'params-key'},
+                            {'data-value': 'data-key'},
+                            {'headers-value': 'headers-key'},
+                            ['a', 'b'])
+
+        self.assertIsNotNone(self.client.last_request)
+        self.assertEqual('doesnt-matter-url', self.client.last_request.url)
+        self.assertEqual('DOESNT-MATTER-METHOD', self.client.last_request.method)
+        self.assertEqual({'params-value': 'params-key'}, self.client.last_request.params)
+        self.assertEqual({'data-value': 'data-key'}, self.client.last_request.data)
+        self.assertEqual({'headers-value': 'headers-key'}, self.client.last_request.headers)
+        self.assertEqual(['a', 'b'], self.client.last_request.auth)
+
+        self.assertIsNotNone(self.client.last_response)
+        self.assertEqual(200, self.client.last_response.status_code)
+        self.assertEqual('testing-unicode: Ω≈ç√, 💩', self.client.last_response.text)
+
+    def test_last_response_empty_on_error(self):
+        self.session_mock.send.side_effect = Exception('voltron')
+
+        with self.assertRaises(Exception):
+            self.client.request('doesnt-matter', 'doesnt-matter')
+
+            self.assertIsNotNone(self.client.last_request)
+            self.assertIsNone(self.client.last_response)
+
 
 class TestHttpClientSession(unittest.TestCase):
 

twilio/http/http_client.py

@@ -2,6 +2,7 @@
 
 from twilio.http import HttpClient
 from twilio.http.response import Response
+from twilio.http.request import Request as TwilioRequest
 
 
 class TwilioHttpClient(HttpClient):
@@ -10,7 +11,9 @@ class TwilioHttpClient(HttpClient):
     """
     def __init__(self, pool_connections=True):
         self.session = Session() if pool_connections else None
-            
+        self.last_request = None
+        self.last_response = None
+
     def request(self, method, url, params=None, data=None, headers=None, auth=None, timeout=None,
                 allow_redirects=False):
         """
@@ -29,8 +32,12 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
         :return: An http response
         :rtype: A :class:`Response <twilio.rest.http.response.Response>` object
         """
+
+        self.last_response = None
         session = self.session or Session()
         request = Request(method.upper(), url, params=params, data=data, headers=headers, auth=auth)
+        self.last_request = TwilioRequest(method.upper(), url, auth=auth, params=params, data=data,
+                                          headers=headers)
 
         prepped_request = session.prepare_request(request)
         response = session.send(
@@ -39,4 +46,6 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
             timeout=timeout,
         )
 
-        return Response(int(response.status_code), response.text)
+        self.last_response = Response(int(response.status_code), response.text)
+
+        return self.last_response