Merge pull request #394 from stripe/ob-fix-393

Make last_response available on save()

stripe/oauth.py

@@ -40,12 +40,12 @@ def token(**params):
         requestor = api_requestor.APIRequestor(api_base=connect_api_base)
         response, api_key = requestor.request(
             'post', '/oauth/token', params, None)
-        return response
+        return response.data
 
     @staticmethod
     def deauthorize(**params):
         requestor = api_requestor.APIRequestor(api_base=connect_api_base)
         OAuth._set_client_id(params)
         response, api_key = requestor.request(
             'post', '/oauth/deauthorize', params, None)
-        return response
+        return response.data

stripe/stripe_object.py

@@ -171,7 +171,8 @@ def refresh_from(self, values, api_key=None, partial=False,
             stripe_version or getattr(values, 'stripe_version', None)
         self.stripe_account = \
             stripe_account or getattr(values, 'stripe_account', None)
-        self._last_response = last_response
+        self._last_response = \
+            last_response or getattr(values, '_last_response', None)
 
         # Wipe old state before setting new.  This is useful for e.g.
         # updating a customer, where there is no persistent card

tests/api_resources/abstract/test_api_resource.py

@@ -18,7 +18,8 @@ def test_retrieve_and_refresh(self):
             {
                 'id': 'foo2',
                 'bobble': 'scrobble',
-            }
+            },
+            rheaders={'request-id': 'req_id'}
         )
 
         res = MyResource.retrieve('foo*', myparam=5)
@@ -35,6 +36,9 @@ def test_retrieve_and_refresh(self):
         self.assertEqual('foo2', res.id)
         self.assertEqual('sk_test_123', res.api_key)
 
+        self.assertTrue(res.last_response is not None)
+        self.assertEqual('req_id', res.last_response.request_id)
+
         url = '/v1/myresources/foo2'
         self.stub_request(
             'get',

tests/api_resources/abstract/test_createable_api_resource.py

@@ -17,7 +17,8 @@ def test_create(self):
             {
                 'object': 'charge',
                 'foo': 'bar',
-            }
+            },
+            rheaders={'request-id': 'req_id'}
         )
 
         res = MyCreatable.create()
@@ -30,14 +31,18 @@ def test_create(self):
         self.assertTrue(isinstance(res, stripe.Charge))
         self.assertEqual('bar', res.foo)
 
+        self.assertTrue(res.last_response is not None)
+        self.assertEqual('req_id', res.last_response.request_id)
+
     def test_idempotent_create(self):
         self.stub_request(
             'post',
             '/v1/mycreatables',
             {
                 'object': 'charge',
                 'foo': 'bar',
-            }
+            },
+            rheaders={'idempotency-key': 'foo'}
         )
 
         res = MyCreatable.create(idempotency_key='foo')
@@ -50,3 +55,6 @@ def test_idempotent_create(self):
         )
         self.assertTrue(isinstance(res, stripe.Charge))
         self.assertEqual('bar', res.foo)
+
+        self.assertTrue(res.last_response is not None)
+        self.assertEqual('foo', res.last_response.idempotency_key)

tests/api_resources/abstract/test_deletable_api_resource.py

@@ -16,7 +16,8 @@ def test_delete(self):
             {
                 'id': 'mid',
                 'deleted': True,
-            }
+            },
+            rheaders={'request-id': 'req_id'}
         )
 
         obj = MyDeletable.construct_from({
@@ -31,3 +32,6 @@ def test_delete(self):
         )
         self.assertEqual(True, obj.deleted)
         self.assertEqual('mid', obj.id)
+
+        self.assertTrue(obj.last_response is not None)
+        self.assertEqual('req_id', obj.last_response.request_id)

tests/api_resources/abstract/test_listable_api_resource.py

@@ -28,7 +28,8 @@ def test_all(self):
                 ],
                 'url': '/v1/charges',
                 'has_more': False,
-            }
+            },
+            rheaders={'request-id': 'req_id'}
         )
 
         res = MyListable.list()
@@ -42,3 +43,6 @@ def test_all(self):
                             for obj in res.data))
         self.assertEqual('jose', res.data[0].name)
         self.assertEqual('curly', res.data[1].name)
+
+        self.assertTrue(res.last_response is not None)
+        self.assertEqual('req_id', res.last_response.request_id)

tests/api_resources/abstract/test_singleton_api_resource.py

@@ -16,7 +16,8 @@ def test_retrieve(self):
             '/v1/mysingleton',
             {
                 'single': 'ton'
-            }
+            },
+            rheaders={'request-id': 'req_id'}
         )
 
         res = MySingleton.retrieve()
@@ -27,3 +28,5 @@ def test_retrieve(self):
             {}
         )
         self.assertEqual('ton', res.single)
+        self.assertTrue(res.last_response is not None)
+        self.assertEqual('req_id', res.last_response.request_id)

tests/api_resources/abstract/test_updateable_api_resource.py

@@ -18,7 +18,8 @@ def setUp(self):
             {
                 'id': 'myid',
                 'thats': 'it',
-            }
+            },
+            rheaders={'request-id': 'req_id'}
         )
 
         self.obj = MyUpdateable.construct_from({
@@ -79,6 +80,9 @@ def test_save(self):
             None
         )
 
+        self.assertTrue(self.obj.last_response is not None)
+        self.assertEqual('req_id', self.obj.last_response.request_id)
+
         # Saving again should not cause any request.
         self.request_mock.reset_mock()
         self.checkSave()

tests/request_mock.py

@@ -3,6 +3,8 @@
 from mock import patch, ANY
 
 import stripe
+from stripe import six
+from stripe.stripe_response import StripeResponse
 
 
 class RequestMock(object):
@@ -28,14 +30,15 @@ def stop(self):
         self.constructor_patcher.stop()
 
     def _patched_request(self, requestor, method, url, *args, **kwargs):
-        response_body = self._stub_request_handler.get_response(method, url)
-        if response_body is not None:
-            return response_body, stripe.api_key
+        response = self._stub_request_handler.get_response(method, url)
+        if response is not None:
+            return response, stripe.api_key
 
         return self._real_request(requestor, method, url, *args, **kwargs)
 
-    def stub_request(self, method, url, response_body={}):
-        self._stub_request_handler.register(method, url, response_body)
+    def stub_request(self, method, url, rbody={}, rcode=200, rheaders={}):
+        self._stub_request_handler.register(method, url, rbody, rcode,
+                                            rheaders)
 
     def assert_api_version(self, expected_api_version):
         # Note that this method only checks that an API version was provided
@@ -94,12 +97,15 @@ class StubRequestHandler(object):
     def __init__(self):
         self._entries = {}
 
-    def register(self, method, url, response_body={}):
-        self._entries[(method, url)] = response_body
+    def register(self, method, url, rbody={}, rcode=200, rheaders={}):
+        self._entries[(method, url)] = (rbody, rcode, rheaders)
 
     def get_response(self, method, url):
         if (method, url) in self._entries:
-            response_body = self._entries.pop((method, url))
-            return response_body
+            rbody, rcode, rheaders = self._entries.pop((method, url))
+            if not isinstance(rbody, six.string_types):
+                rbody = stripe.util.json.dumps(rbody)
+            stripe_response = StripeResponse(rbody, rcode, rheaders)
+            return stripe_response
 
         return None

tests/test_stripe_object.py

@@ -3,6 +3,7 @@
 import datetime
 import pickle
 from copy import copy, deepcopy
+from mock import Mock
 
 import stripe
 from stripe import util, six
@@ -106,18 +107,26 @@ def test_refresh_from(self):
         self.assertEqual('me', obj['trans'])
         self.assertEqual(None, obj.stripe_version)
         self.assertEqual(None, obj.stripe_account)
+        self.assertEqual(None, obj.last_response)
 
-        obj.refresh_from({
-            'foo': 'baz',
-            'johnny': 5,
-        }, 'key2', stripe_version='2017-08-15', stripe_account='acct_foo')
+        last_response = Mock()
+        obj.refresh_from(
+            {
+                'foo': 'baz',
+                'johnny': 5,
+            }, 'key2',
+            stripe_version='2017-08-15',
+            stripe_account='acct_foo',
+            last_response=last_response
+        )
 
         self.assertEqual(5, obj.johnny)
         self.assertEqual('baz', obj.foo)
         self.assertRaises(AttributeError, getattr, obj, 'trans')
         self.assertEqual('key2', obj.api_key)
         self.assertEqual('2017-08-15', obj.stripe_version)
         self.assertEqual('acct_foo', obj.stripe_account)
+        self.assertEqual(last_response, obj.last_response)
 
         obj.refresh_from({
             'trans': 4,