Merge pull request #24 from payjp/matuura/term-balance

add term and balance API

Author: koki-matsuura-pay

payjp/__init__.py

@@ -11,9 +11,22 @@
 retry_max_delay = 32
 
 # TODO include Card?
-__all__ = ['Account', 'Card', 'Charge', 'Customer', 'Event', 'Plan', 'Subscription', 'Token', 'Transfer', 'Statement']
+__all__ = [
+    'Account',
+    'Card',
+    'Charge',
+    'Customer',
+    'Event',
+    'Plan',
+    'Subscription',
+    'Token',
+    'Transfer',
+    'Statement',
+    'Term',
+    'Balance'
+]
 
 # Resource
 from payjp.resource import (  # noqa
-    Account, Charge, Customer, Event, Plan, Subscription, Token, Transfer, Statement)
+    Account, Charge, Customer, Event, Plan, Subscription, Token, Transfer, Statement, Term, Balance)
 

payjp/resource.py

@@ -16,7 +16,7 @@ def convert_to_payjp_object(resp, api_key, account, api_base=None):
              'charge': Charge, 'customer': Customer,
              'event': Event, 'plan': Plan,
              'subscription': Subscription, 'token': Token,
-             'transfer': Transfer, 'statement': Statement, 'list': ListObject}
+             'transfer': Transfer, 'statement': Statement, 'list': ListObject, 'term': Term, 'balance': Balance}
 
     if isinstance(resp, list):
         return [convert_to_payjp_object(i, api_key, account, api_base) for i in resp]
@@ -429,3 +429,11 @@ def statement_urls(self, **kwargs):
         url = self.instance_url() + '/statement_urls'
         self.refresh_from(self.request('post', url, kwargs))
         return self
+
+
+class Term(ListableAPIResource):
+    pass
+
+
+class Balance(ListableAPIResource):
+    pass

payjp/test/test_resources.py

@@ -1143,5 +1143,73 @@ def test_statement_urls(self):
         )
 
 
+class TermTest(PayjpResourceTest):
+
+    def test_list_terms(self):
+        payjp.Term.all()
+        self.requestor_mock.request.assert_called_with(
+            'get',
+            '/v1/terms',
+            {}
+        )
+
+    def test_retrieve_term(self):
+        payjp.Term.retrieve('term_foo')
+        self.requestor_mock.request.assert_called_with(
+            'get',
+            '/v1/terms/term_foo',
+            {},
+            None
+        )
+
+
+class BalanceTest(PayjpResourceTest):
+    response = {
+        "created": 1438354800,
+        "id": "ba_xxx",
+        "livemode": False,
+        "net": 1000,
+        "object": "balance",
+        "state": "collecting",
+        "statements": [{
+            "balance_id": "ba_xxx",
+            "created": 1438354800,
+            "id": "st_xxx",
+            "object": "statement",
+        }],
+        "closed": False,
+        "due_date": None,
+        "bank_info": None,
+        "tenant_id": None
+    }
+
+    def test_list_balances(self):
+        payjp.Balance.all()
+        self.requestor_mock.request.assert_called_with(
+            'get',
+            '/v1/balances',
+            {}
+        )
+
+    def test_retrieve_balance(self):
+        balance = payjp.Balance.retrieve('balance_foo')
+        self.requestor_mock.request.assert_called_with(
+            'get',
+            '/v1/balances/balance_foo',
+            {},
+            None
+        )
+        self.assertTrue(isinstance(balance, payjp.Balance))
+        self.assertEqual(balance.id, 'ba_xxx')
+        self.assertTrue(isinstance(balance.statements[0], payjp.Statement))
+        balance.statements[0].statement_urls()
+        self.requestor_mock.request.assert_called_with(
+            'post',
+            '/v1/statements/st_xxx/statement_urls',
+            {},
+            None
+        )
+
+
 if __name__ == '__main__':
     unittest.main()

payjp/version.py

@@ -1 +1 @@
-VERSION = '0.2.0'
+VERSION = '0.4.0'

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name="payjp",
-    version="0.2.0",
+    version="0.4.0",
     description='PAY.JP python bindings',
     author="PAY.JP",
     author_email='support@pay.jp',