Merge lp:~matiasb/payclient/payment-method-api into lp:payclient

[Matias Bordese]

Updated client to add get/disable payment method API calls.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'src/payclient/client.py'
--- src/payclient/client.py	2013-12-10 18:06:42 +0000
+++ src/payclient/client.py	2014-07-21 18:37:20 +0000
@@ -208,6 +208,22 @@
         return self._get("payment_methods/%s/" % open_id)
 
     @basic_protected
+    @validate_pattern('open_id', RE_OPEN_ID)
+    @returns_json
+    def get_payment_method(self, open_id, backend, method_id):
+        """Retrieve payment method by open id, given backend and method_id."""
+        return self._get(
+            "payment_methods/%s/%s/%s/" % (open_id, backend, method_id))
+
+    @basic_protected
+    @validate_pattern('open_id', RE_OPEN_ID)
+    @returns_json
+    def disable_payment_method(self, open_id, backend, method_id):
+        """Disable payment method by open id, given backend and method_id."""
+        return self._delete(
+            "payment_methods/%s/%s/%s/" % (open_id, backend, method_id))
+
+    @basic_protected
     @validate_pattern('payment_id', RE_PAYMENT_ID)
     @returns(PaymentResponse)
     def get_payment(self, payment_id):

=== modified file 'src/payclient/tests/test_client.py'
--- src/payclient/tests/test_client.py	2013-12-17 20:24:25 +0000
+++ src/payclient/tests/test_client.py	2014-07-21 18:37:20 +0000
@@ -389,6 +389,7 @@
         self.api = PaymentServiceAPI()
         # mock out methods calling out
         self.api._get = Mock()
+        self.api._delete = Mock()
         self.api._post = Mock()
         self.api._put = Mock()
 
@@ -396,6 +397,7 @@
             auth=BasicAuthorizer('user', 'pass'))
         # mock out methods calling out
         self.auth_api._get = Mock()
+        self.auth_api._delete = Mock()
         self.auth_api._post = Mock()
         self.auth_api._put = Mock()
 
@@ -423,7 +425,7 @@
                 'subscription': None,
             },
         ])
-        self.mock_methods_response_body = json.dumps([
+        methods = [
             {
                 'id': 'backend_label',
                 'description': 'The backend',
@@ -433,7 +435,9 @@
                              'currencies': ['USD', 'GBP'],
                             }],
             },
-        ])
+        ]
+        self.mock_methods_response_body = json.dumps(methods)
+        self.mock_method_response_body = json.dumps(methods[0]['choices'][0])
         self.mock_json_response = json.dumps({
             'success': True,
         })
@@ -518,6 +522,40 @@
         self.auth_api._get.return_value = self.mock_methods_response_body
         self.assert_return_value(list, 'payment_methods', open_id='abc1234')
 
+    def test_get_payment_method_validation(self):
+        kwargs = dict(backend='backend_label', method_id='42')
+        self.assert_validate_pattern(
+            'get_payment_method', open_id='', **kwargs)
+        self.assert_validate_pattern(
+            'get_payment_method', open_id='123_foo', **kwargs)
+        self.assert_validate_pattern(
+            'get_payment_method', open_id='abc123', **kwargs)
+        self.assert_validate_pattern(
+            'get_payment_method', open_id='abc12345', **kwargs)
+
+    def test_get_payment_method_returns_json(self):
+        self.auth_api._get.return_value = self.mock_method_response_body
+        self.assert_return_value(
+            dict, 'get_payment_method', open_id='abc1234',
+            backend='backend_label', method_id='42')
+
+    def test_disable_payment_method_validation(self):
+        kwargs = dict(backend='backend_label', method_id='42')
+        self.assert_validate_pattern(
+            'disable_payment_method', open_id='', **kwargs)
+        self.assert_validate_pattern(
+            'disable_payment_method', open_id='123_foo', **kwargs)
+        self.assert_validate_pattern(
+            'disable_payment_method', open_id='abc123', **kwargs)
+        self.assert_validate_pattern(
+            'disable_payment_method', open_id='abc12345', **kwargs)
+
+    def test_disable_payment_method_returns_json(self):
+        self.auth_api._delete.return_value = self.mock_json_response
+        self.assert_return_value(
+            dict, 'disable_payment_method', open_id='abc1234',
+            backend='backend_label', method_id='42')
+
     def test_new_card_protected(self):
         request = CreditCardRequest()
         self.assert_protected(