3.9.0

braintreeps · braintreeps · commit 98867bba6b6e · 2015-01-30T01:38:57.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 3.9.0
+* Support Coinbase accounts
+* Surface Apple Pay payment instrument name in responses
+* Expose subscription status events
+* Support SEPA bank accounts for customer
+* Improve documentation
+
 ## 3.8.0
 * Add error code constants
 * Allow PayPal parameters to be sent in options.paypal
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ instructions above for upgrading from pycurl / httplib to requests.
 
 ## Documentation
 
- * [Official documentation](https://www.braintreepayments.com/docs/python)
+ * [Official documentation](https://developers.braintreepayments.com/python/sdk/server/overview)
 
 ## Quick Start Example
 
diff --git a/braintree/__init__.py b/braintree/__init__.py
@@ -38,6 +38,7 @@
 from braintree.settlement_batch_summary import SettlementBatchSummary
 from braintree.subscription import Subscription
 from braintree.subscription_gateway import SubscriptionGateway
+from braintree.subscription_status_event import SubscriptionStatusEvent
 from braintree.status_event import StatusEvent
 from braintree.testing_gateway import TestingGateway
 from braintree.transaction import Transaction
diff --git a/braintree/coinbase_account.py b/braintree/coinbase_account.py
@@ -0,0 +1,8 @@
+import braintree
+from braintree.resource import Resource
+
+class CoinbaseAccount(Resource):
+    def __init__(self, gateway, attributes):
+        Resource.__init__(self, gateway, attributes)
+        if "subscriptions" in attributes:
+            self.subscriptions = [braintree.subscription.Subscription(gateway, subscription) for subscription in self.subscriptions]
diff --git a/braintree/customer.py b/braintree/customer.py
@@ -6,6 +6,8 @@
 from braintree.apple_pay_card import ApplePayCard
 from braintree.credit_card import CreditCard
 from braintree.paypal_account import PayPalAccount
+from braintree.sepa_bank_account import SEPABankAccount
+from braintree.coinbase_account import CoinbaseAccount
 from braintree.address import Address
 from braintree.configuration import Configuration
 from braintree.ids_search import IdsSearch
@@ -196,3 +198,9 @@ def __init__(self, gateway, attributes):
 
         if "apple_pay_cards" in attributes:
             self.apple_pay_cards  = [ApplePayCard(gateway, apple_pay_card) for apple_pay_card in self.apple_pay_cards]
+
+        if "sepa_bank_accounts" in attributes:
+            self.sepa_bank_accounts = [SEPABankAccount(gateway, sepa_bank_account) for sepa_bank_account in self.sepa_bank_accounts]
+
+        if "coinbase_accounts" in attributes:
+            self.coinbase_accounts = [CoinbaseAccount(gateway, coinbase_account) for coinbase_account in self.coinbase_accounts]
diff --git a/braintree/payment_method_gateway.py b/braintree/payment_method_gateway.py
@@ -4,6 +4,7 @@
 from braintree.payment_method import PaymentMethod
 from braintree.paypal_account import PayPalAccount
 from braintree.sepa_bank_account import SEPABankAccount
+from braintree.coinbase_account import CoinbaseAccount
 from braintree.unknown_payment_method import UnknownPaymentMethod
 from braintree.error_result import ErrorResult
 from braintree.exceptions.not_found_error import NotFoundError
@@ -73,6 +74,8 @@ def _parse_payment_method(self, response):
             return SEPABankAccount(self.gateway, response["sepa_bank_account"])
         elif "apple_pay_card" in response:
             return ApplePayCard(self.gateway, response["apple_pay_card"])
+        elif "coinbase_account" in response:
+            return CoinbaseAccount(self.gateway, response["coinbase_account"])
         else:
             name = list(response)[0]
             return UnknownPaymentMethod(self.gateway, response[name])
diff --git a/braintree/subscription.py b/braintree/subscription.py
@@ -7,6 +7,7 @@
 from braintree.discount import Discount
 from braintree.exceptions.not_found_error import NotFoundError
 from braintree.resource_collection import ResourceCollection
+from braintree.subscription_status_event import SubscriptionStatusEvent
 from braintree.successful_result import SuccessfulResult
 from braintree.error_result import ErrorResult
 from braintree.transaction import Transaction
@@ -45,6 +46,12 @@ class TrialDurationUnit(object):
         Day = "day"
         Month = "month"
 
+    class Source(object):
+        Api          = "api"
+        ControlPanel = "control_panel"
+        Recurring    = "recurring"
+        Unrecognized = "unrecognized"
+
     class Status(object):
         """
         Constants representing subscription statusues.  Available statuses are:
@@ -231,6 +238,8 @@ def __init__(self, gateway, attributes):
             self.descriptor = Descriptor(gateway, attributes.pop("descriptor"))
         if "discounts" in attributes:
             self.discounts = [Discount(gateway, discount) for discount in self.discounts]
+        if "status_history" in attributes:
+            self.status_history = [SubscriptionStatusEvent(gateway, status_event) for status_event in self.status_history]
         if "transactions" in attributes:
             self.transactions = [Transaction(gateway, transaction) for transaction in self.transactions]
 
diff --git a/braintree/subscription_status_event.py b/braintree/subscription_status_event.py
@@ -0,0 +1,9 @@
+from decimal import Decimal
+from braintree.resource import Resource
+
+class SubscriptionStatusEvent(Resource):
+    def __init__(self, gateway, attributes):
+        Resource.__init__(self, gateway, attributes)
+
+        self.balance = Decimal(self.balance)
+        self.price = Decimal(self.price)
diff --git a/braintree/test/nonces.py b/braintree/test/nonces.py
@@ -7,3 +7,4 @@ class Nonces(object):
     ApplePayMasterCard = "fake-apple-pay-mastercard-nonce"
     ApplePayAmEx = "fake-apple-pay-amex-nonce"
     AbstractTransactable = "fake-abstract-transactable-nonce"
+    Coinbase = "fake-coinbase-nonce"
diff --git a/braintree/transaction.py b/braintree/transaction.py
@@ -3,6 +3,7 @@
 from decimal import Decimal
 from braintree.add_on import AddOn
 from braintree.apple_pay_card import ApplePayCard
+from braintree.coinbase_account import CoinbaseAccount
 from braintree.disbursement_detail import DisbursementDetail
 from braintree.dispute import Dispute
 from braintree.discount import Discount
@@ -492,6 +493,8 @@ def __init__(self, gateway, attributes):
             self.sepa_bank_account_details = SEPABankAccount(gateway, attributes.pop("sepa_bank_account"))
         if "apple_pay" in attributes:
             self.apple_pay_details = ApplePayCard(gateway, attributes.pop("apple_pay"))
+        if "coinbase_account" in attributes:
+            self.coinbase_details = CoinbaseAccount(gateway, attributes.pop("coinbase_account"))
         if "customer" in attributes:
             self.customer_details = Customer(gateway, attributes.pop("customer"))
         if "shipping" in attributes:
diff --git a/braintree/version.py b/braintree/version.py
@@ -1 +1 @@
-Version = "3.8.0"
+Version = "3.9.0"
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+requests>=0.11.1,<3.0
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 setup(
     name="braintree",
-    version="3.8.0",
+    version="3.9.0",
     description="Braintree Python Library",
     author="Braintree",
     author_email="support@braintreepayments.com",
diff --git a/tests/integration/test_coinbase.py b/tests/integration/test_coinbase.py
@@ -0,0 +1,36 @@
+from tests.test_helper import *
+
+from braintree.test.nonces import Nonces
+from braintree.exceptions.not_found_error import NotFoundError
+
+class TestCoinbase(unittest.TestCase):
+
+    def _assert_valid_coinbase_account(self, account):
+        for attr in ["user_name", "user_email", "user_id"]:
+            self.assertIsNotNone(getattr(account, attr))
+
+    def test_customer(self):
+        result = Customer.create({"payment_method_nonce": Nonces.Coinbase})
+        customer = Customer.find(result.customer.id)
+        account = customer.coinbase_accounts[0]
+        self.assertIsNotNone(account)
+        self._assert_valid_coinbase_account(account)
+
+    def test_vault(self):
+        result = Customer.create()
+        result = PaymentMethod.create({
+            "customer_id": result.customer.id,
+            "payment_method_nonce": Nonces.Coinbase
+        })
+
+        account = result.payment_method
+        self._assert_valid_coinbase_account(account)
+
+        PaymentMethod.delete(account.token)
+
+        self.assertRaises(braintree.exceptions.NotFoundError, PaymentMethod.find, account.token)
+
+    def test_transaction(self):
+        result = Transaction.sale({"payment_method_nonce": Nonces.Coinbase, "amount": "1.00"})
+        account = result.transaction.coinbase_details
+        self._assert_valid_coinbase_account(account)
diff --git a/tests/integration/test_payment_method.py b/tests/integration/test_payment_method.py
@@ -154,6 +154,7 @@ def test_create_with_fake_apple_pay_nonce(self):
         self.assertIsInstance(apple_pay_card, ApplePayCard)
         self.assertNotEqual(apple_pay_card.token, None)
         self.assertEqual(ApplePayCard.CardType.MasterCard, apple_pay_card.card_type)
+        self.assertEqual("MasterCard 0017", apple_pay_card.payment_instrument_name)
         self.assertTrue(apple_pay_card.default)
         self.assertIn("apple_pay", apple_pay_card.image_url)
         self.assertTrue(int(apple_pay_card.expiration_month) > 0)
diff --git a/tests/integration/test_subscription.py b/tests/integration/test_subscription.py
@@ -50,6 +50,11 @@ def test_create_returns_successful_result_if_valid(self):
         self.assertEquals(0, subscription.failure_count)
         self.assertEquals(self.credit_card.token, subscription.payment_method_token)
 
+        self.assertEquals(Subscription.Status.Active, subscription.status_history[0].status)
+        self.assertEquals(Decimal("12.34"), subscription.status_history[0].price)
+        self.assertEquals(Decimal("0.00"), subscription.status_history[0].balance)
+        self.assertEquals(Subscription.Source.Api, subscription.status_history[0].subscription_source)
+
     def test_create_returns_successful_result_with_payment_method_nonce(self):
         config = Configuration.instantiate()
         customer_id = Customer.create().customer.id
diff --git a/tests/integration/test_transaction.py b/tests/integration/test_transaction.py
@@ -751,6 +751,7 @@ def test_sale_with_fake_apple_pay_nonce(self):
         apple_pay_details = result.transaction.apple_pay_details
         self.assertNotEqual(None, apple_pay_details)
         self.assertEqual(ApplePayCard.CardType.AmEx, apple_pay_details.card_type)
+        self.assertEqual("AmEx 41002", apple_pay_details.payment_instrument_name)
         self.assertTrue(int(apple_pay_details.expiration_month) > 0)
         self.assertTrue(int(apple_pay_details.expiration_year) > 0)
         self.assertNotEqual(None, apple_pay_details.cardholder_name)
diff --git a/tests/unit/test_customer.py b/tests/unit/test_customer.py
@@ -60,3 +60,14 @@ def test_initialize_sets_paypal_accounts(self):
 
         self.assertEquals(customer.paypal_accounts[0].token, "token1")
         self.assertEquals(customer.paypal_accounts[1].token, "token2")
+
+    def test_initialize_sets_sepa_bank_accounts(self):
+        customer = Customer("gateway", {
+            "sepa_bank_accounts": [
+                {"token": "token1"},
+                {"token": "token2"}
+            ]
+        })
+
+        self.assertEquals(customer.sepa_bank_accounts[0].token, "token1")
+        self.assertEquals(customer.sepa_bank_accounts[1].token, "token2")
