braintree 2.31.0 → 2.32.1

data/README.rdoc

@@ -45,7 +45,7 @@ Example of using non-bang method:
 
   result = Braintree::Customer.create(:first_name => "Josh")
   if result.success?
-    puts "Created customer #{result.customer.id}
+    puts "Created customer #{result.customer.id}"
   else
     puts "Validations failed"
     result.errors.for(:customer).each do |error|
@@ -57,7 +57,7 @@ Example of using bang method:
 
   begin
     customer = Braintree::Customer.create!(:first_name => "Josh")
-    puts "Created customer #{customer.id}
+    puts "Created customer #{customer.id}"
   rescue Braintree::ValidationsFailed
     puts "Validations failed"
   end

data/lib/braintree.rb

@@ -53,11 +53,18 @@ require "braintree/merchant_account/individual_details"
 require "braintree/merchant_account/business_details"
 require "braintree/merchant_account/funding_details"
 require "braintree/merchant_account/address_details"
+require "braintree/payment_instrument_type"
+require "braintree/payment_method"
+require "braintree/payment_method_gateway"
+require "braintree/paypal_account"
+require "braintree/paypal_account_gateway"
 require "braintree/plan"
 require "braintree/plan_gateway"
 require "braintree/settlement_batch_summary"
 require "braintree/settlement_batch_summary_gateway"
 require "braintree/resource_collection"
+require "braintree/sepa_bank_account"
+require "braintree/sepa_bank_account_gateway"
 require "braintree/sha256_digest"
 require "braintree/signature_service"
 require "braintree/subscription"
@@ -67,16 +74,21 @@ require "braintree/successful_result"
 require "braintree/test/credit_card"
 require "braintree/test/merchant_account"
 require "braintree/test/venmo_sdk"
+require "braintree/test/nonce"
 require "braintree/test/transaction_amounts"
+require "braintree/testing_gateway"
 require "braintree/transaction"
+require "braintree/test_transaction"
 require "braintree/transaction/address_details"
 require "braintree/transaction/credit_card_details"
 require "braintree/transaction/customer_details"
 require "braintree/transaction/disbursement_details"
+require "braintree/transaction/paypal_details"
 require "braintree/transaction/subscription_details"
 require "braintree/transaction_gateway"
 require "braintree/transaction_search"
 require "braintree/transaction/status_details"
+require "braintree/unknown_payment_method"
 require "braintree/disbursement"
 require "braintree/transparent_redirect"
 require "braintree/transparent_redirect_gateway"

data/lib/braintree/client_token.rb

@@ -2,8 +2,13 @@ require 'json'
 
 module Braintree
   module ClientToken
+    DEFAULT_VERSION = 2
+
     def self.generate(options={})
       _validate_options(options)
+
+      options[:version] ||= DEFAULT_VERSION
+
       Configuration.gateway.client_token.generate(options)
     end
 

data/lib/braintree/client_token_gateway.rb

@@ -22,7 +22,8 @@ module Braintree
 
     def self._generate_signature # :nodoc:
       [
-        :customer_id, :proxy_merchant_id,
+        :address_id, :customer_id, :proxy_merchant_id, :merchant_account_id,
+        :version, :sepa_mandate_acceptance_location, :sepa_mandate_type,
         {:options => [:make_default, :verify_card, :fail_on_duplicate_payment_method]}
       ]
     end

data/lib/braintree/configuration.rb

@@ -1,7 +1,7 @@
 module Braintree
   # See http://www.braintreepayments.com/docs/ruby
   class Configuration
-    API_VERSION = "3" # :nodoc:
+    API_VERSION = "4" # :nodoc:
     DEFAULT_ENDPOINT = "api" # :nodoc:
 
     class << self

data/lib/braintree/credit_card.rb

@@ -165,7 +165,7 @@ module Braintree
       @gateway.credit_card.delete(token)
     end
 
-    # Returns true if this credit card is the customer's default.
+    # Returns true if this credit card is the customer's default payment method.
     def default?
       @default
     end

data/lib/braintree/credit_card_gateway.rb

@@ -25,7 +25,7 @@ module Braintree
     end
 
     def delete(token)
-      @config.http.delete("/payment_methods/#{token}")
+      @config.http.delete("/payment_methods/credit_card/#{token}")
     end
 
     def expired(options = {})
@@ -42,7 +42,7 @@ module Braintree
 
     def find(token)
       raise ArgumentError if token.nil? || token.to_s.strip == ""
-      response = @config.http.get "/payment_methods/#{token}"
+      response = @config.http.get "/payment_methods/credit_card/#{token}"
       CreditCard._new(@gateway, response[:credit_card])
     rescue NotFoundError
       raise NotFoundError, "payment method with token #{token.inspect} not found"
@@ -58,7 +58,7 @@ module Braintree
 
     def update(token, attributes)
       Util.verify_keys(CreditCardGateway._update_signature, attributes)
-      _do_update(:put, "/payment_methods/#{token}", :credit_card => attributes)
+      _do_update(:put, "/payment_methods/credit_card/#{token}", :credit_card => attributes)
     end
 
     # Deprecated

data/lib/braintree/customer.rb

@@ -4,7 +4,7 @@ module Braintree
     include BaseModule
 
     attr_reader :addresses, :company, :created_at, :credit_cards, :email, :fax, :first_name, :id, :last_name,
-      :phone, :updated_at, :website, :custom_fields
+      :phone, :updated_at, :website, :custom_fields, :paypal_accounts
 
     # See http://www.braintreepayments.com/docs/ruby/customers/search
     def self.all
@@ -107,6 +107,7 @@ module Braintree
       @gateway = gateway
       set_instance_variables_from_hash(attributes)
       @credit_cards = (@credit_cards || []).map { |pm| CreditCard._new gateway, pm }
+      @paypal_accounts = (@paypal_accounts || []).map { |pm| PayPalAccount._new gateway, pm }
       @addresses = (@addresses || []).map { |addr| Address._new gateway, addr }
       @custom_fields = attributes[:custom_fields].is_a?(Hash) ? attributes[:custom_fields] : {}
     end
@@ -121,9 +122,17 @@ module Braintree
       return_object_or_raise(:transaction) { credit(transaction_attributes) }
     end
 
-    # Returns the default credit card of the customer
+    # Deprecated. Use Braintree::Customer.default_payment_method
+    #
+    # Returns the customer's default credit card.
     def default_credit_card
-       @credit_cards.find {|credit_card| credit_card.default? }
+      warn "[DEPRECATED] Customer#default_credit_card is deprecated. Please use Customer#default_payment_method"
+      @credit_cards.find { |credit_card| credit_card.default? }
+    end
+
+    # Returns the customer's default payment method.
+    def default_payment_method
+      payment_methods.find { |payment_instrument| payment_instrument.default? }
     end
 
     # See http://www.braintreepayments.com/docs/ruby/customers/delete
@@ -131,9 +140,14 @@ module Braintree
       @gateway.customer.delete(id)
     end
 
+    # Returns the customer's payment methods
+    def payment_methods
+      @credit_cards.dup + @paypal_accounts.dup
+    end
+
     def inspect # :nodoc:
       first = [:id]
-      last = [:addresses, :credit_cards]
+      last = [:addresses, :credit_cards, :paypal_accounts]
       order = first + (self.class._attributes - first - last) + last
       nice_attributes = order.map do |attr|
         "#{attr}: #{send(attr).inspect}"

data/lib/braintree/customer_gateway.rb

@@ -74,7 +74,7 @@ module Braintree
       credit_card_signature = CreditCardGateway._create_signature - [:customer_id]
       [
         :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,
-        :device_data,
+        :device_data, :payment_method_nonce,
         {:credit_card => credit_card_signature},
         {:custom_fields => :_any_key_}
       ]
@@ -123,7 +123,7 @@ module Braintree
       credit_card_options[:options] << :update_existing_token
       [
         :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,
-        :device_data,
+        :device_data, :payment_method_nonce,
         {:credit_card => credit_card_signature},
         {:custom_fields => :_any_key_}
       ]

data/lib/braintree/customer_search.rb

@@ -17,6 +17,7 @@ module Braintree
       :id,
       :last_name,
       :payment_method_token,
+      :paypal_account_email,
       :phone,
       :website
     )

data/lib/braintree/error_codes.rb

@@ -37,35 +37,43 @@ module Braintree
     module CreditCard
       BillingAddressConflict = "91701"
       BillingAddressIdIsInvalid = "91702"
-      CustomerIdIsRequired = "91704"
-      CustomerIdIsInvalid = "91705"
-      ExpirationDateConflict = "91708"
-      TokenFormatIsInvalid = "91718"
-      TokenIsInUse = "91719"
-      TokenIsTooLong = "91720"
-      TokenIsNotAllowed = "91721"
-      TokenIsRequired = "91722"
+      CannotUpdateCardUsingPaymentMethodNonce = "91735"
       CardholderNameIsTooLong = "81723"
       CreditCardTypeIsNotAccepted = "81703"
       CreditCardTypeIsNotAcceptedBySubscriptionMerchantAccount = "81718"
-      CvvIsRequired = "81706"
+      CustomerIdIsInvalid = "91705"
+      CustomerIdIsRequired = "91704"
       CvvIsInvalid = "81707"
+      CvvIsRequired = "81706"
+      CvvVerificationFailed = "81736"
+      PostalCodeVerificationFailed = "81737"
       DuplicateCardExists = "81724"
-      ExpirationDateIsRequired = "81709"
+      ExpirationDateConflict = "91708"
       ExpirationDateIsInvalid = "81710"
+      ExpirationDateIsRequired = "81709"
       ExpirationDateYearIsInvalid = "81711"
       ExpirationMonthIsInvalid = "81712"
       ExpirationYearIsInvalid = "81713"
       InvalidVenmoSDKPaymentMethodCode = "91727"
-      NumberIsRequired = "81714"
       NumberIsInvalid = "81715"
+      NumberIsRequired = "81714"
       NumberLengthIsInvalid = "81716"
       NumberMustBeTestNumber = "81717"
       PaymentMethodConflict = "81725"
+      PaymentMethodNonceCardTypeIsNotAccepted = "91734"
+      PaymentMethodNonceConsumed = "91731"
+      PaymentMethodNonceLocked = "91733"
+      PaymentMethodNonceUnknown = "91732"
+      TokenFormatIsInvalid = "91718"
+      TokenIsInUse = "91719"
+      TokenIsNotAllowed = "91721"
+      TokenIsRequired = "91722"
+      TokenIsTooLong = "91720"
       VenmoSDKPaymentMethodCodeCardTypeIsNotAccepted = "91726"
       VerificationNotSupportedOnThisMerchantAccount = "91730"
 
       module Options
+        UseBillingForShippingDisabled = "91572"
         UpdateExistingTokenIsInvalid = "91723"
         VerificationMerchantAccountIdIsInvalid = "91728"
         UpdateExistingTokenNotAllowed = "91729"
@@ -101,6 +109,20 @@ module Braintree
       InternationalPhoneFormatIsInvalid = "92205"
     end
 
+    module PayPalAccount
+      CannotVaultOneTimeUsePayPalAccount = "82902"
+      CannotHaveBothAccessTokenAndConsentCode = "82903"
+      ConsentCodeOrAccessTokenIsRequired = "82901"
+      CustomerIdIsRequiredForVaulting = "82905"
+      IncompletePayPalAccount = "82901"
+      PaymentMethodNonceConsumed = "92907"
+      PaymentMethodNonceLocked = "92909"
+      PaymentMethodNonceUnknown = "92908"
+      PayPalAccountsAreNotAccepted = "82904"
+      PayPalCommunicationError = "92910"
+      TokenIsInUse = "92906"
+    end
+
     # See http://www.braintreepayments.com/docs/ruby/subscriptions/validations
     module Subscription
       BillingDayOfMonthCannotBeUpdated = "91918"
@@ -123,6 +145,10 @@ module Braintree
       NumberOfBillingCyclesIsTooSmall = "91909"
       NumberOfBillingCyclesMustBeGreaterThanZero = "91907"
       NumberOfBillingCyclesMustBeNumeric = "91906"
+      PaymentMethodNonceCardTypeIsNotAccepted = "91924"
+      PaymentMethodNonceIsInvalid = "91925"
+      PaymentMethodNonceNotAssociatedWithCustomer = "91926"
+      PaymentMethodNonceUnvaultedCardIsNotAccepted = "91927"
       PaymentMethodTokenCardTypeIsNotAccepted = "91902"
       PaymentMethodTokenIsInvalid = "91903"
       PaymentMethodTokenNotAssociatedWithCustomer = "91905"
@@ -147,6 +173,7 @@ module Braintree
         ExistingIdIsInvalid = "92011"
         ExistingIdIsRequired = "92012"
         IdToRemoveIsIncorrectKind = "92021"
+        IdToRemoveIsInvalid = "92025"
         IdToRemoveIsNotPresent = "92016"
         InconsistentNumberOfBillingCycles = "92018"
         InheritedFromIdIsInvalid = "92013"
@@ -173,6 +200,7 @@ module Braintree
       CannotBeVoided = "91504"
       CannotCancelRelease = "91562"
       CannotCloneCredit = "91543"
+      CannotCloneTransactionWithPayPalAccount = "91573"
       CannotCloneTransactionWithVaultCreditCard = "91540"
       CannotCloneUnsuccessfulTransaction = "91542"
       CannotCloneVoiceAuthorizations = "91541"
@@ -181,9 +209,12 @@ module Braintree
       CannotRefundCredit = "91505"
       CannotRefundUnlessSettled = "91506"
       CannotRefundWithPendingMerchantAccount = "91559"
+      CannotRefundSettlingTransaction = "91574"
       CannotRefundWithSuspendedMerchantAccount = "91538"
       CannotReleaseFromEscrow = "91561"
+      CannotSimulateTransactionSettlement = "91575"
       CannotSubmitForSettlement = "91507"
+      ChannelIsTooLong = "91550"
       CreditCardIsRequired = "91508"
       CustomFieldIsInvalid = "91526"
       CustomFieldIsTooLong = "81527"
@@ -191,18 +222,23 @@ module Braintree
       CustomerDoesNotHaveCreditCard = "91511"
       CustomerIdIsInvalid = "91510"
       HasAlreadyBeenRefunded = "91512"
-      MerchantAccountDoesNotSupportRefunds = "91547"
       MerchantAccountDoesNotSupportMOTO = "91558"
+      MerchantAccountDoesNotSupportRefunds = "91547"
       MerchantAccountIdIsInvalid = "91513"
       MerchantAccountIsSuspended = "91514"
       OrderIdIsTooLong = "91501"
-      ChannelIsTooLong = "91550"
       PaymentMethodConflict = "91515"
       PaymentMethodConflictWithVenmoSDK = "91549"
       PaymentMethodDoesNotBelongToCustomer = "91516"
       PaymentMethodDoesNotBelongToSubscription = "91527"
+      PaymentMethodNonceCardTypeIsNotAccepted = "91567"
+      PaymentMethodNonceConsumed = "91564"
+      PaymentMethodNonceLocked = "91566"
+      PaymentMethodNonceUnknown = "91565"
       PaymentMethodTokenCardTypeIsNotAccepted = "91517"
       PaymentMethodTokenIsInvalid = "91518"
+      PaymentInstrumentNotSupportedByMerchantAccount = "91577"
+      PayPalNotEnabled = "91576"
       ProcessorAuthorizationCodeCannotBeSet = "91519"
       ProcessorAuthorizationCodeIsInvalid = "81520"
       ProcessorDoesNotSupportCredits = "91546"
@@ -213,8 +249,8 @@ module Braintree
       ServiceFeeAmountCannotBeNegative = "91554"
       ServiceFeeAmountFormatIsInvalid = "91555"
       ServiceFeeAmountIsTooLarge = "91556"
-      ServiceFeeIsNotAllowedOnCredits = "91552"
       ServiceFeeAmountNotAllowedOnMasterMerchantAccount = "91557"
+      ServiceFeeIsNotAllowedOnCredits = "91552"
       SettlementAmountIsLessThanServiceFeeAmount = "91551"
       SettlementAmountIsTooLarge = "91522"
       SubMerchantAccountRequiresServiceFeeAmount = "91553"
@@ -224,6 +260,9 @@ module Braintree
       TaxAmountCannotBeNegative = "81534"
       TaxAmountFormatIsInvalid = "81535"
       TaxAmountIsTooLarge = "81536"
+      ThreeDSecureAuthenticationFailed = "81571"
+      ThreeDSecureTokenIsInvalid = "91568"
+      ThreeDSecureTransactionDataDoesntMatchVerify = "91570"
       TypeIsInvalid = "91523"
       TypeIsRequired = "91524"
       UnsupportedVoiceAuthorization = "91539"
@@ -347,6 +386,34 @@ module Braintree
       SettlementDateIsInvalid = "82302"
       CustomFieldIsInvalid = "82303"
     end
+
+    module ClientToken
+      CustomerDoesNotExist = "92804"
+      FailOnDuplicatePaymentMethodRequiresCustomerId = "92803"
+      MakeDefaultRequiresCustomerId = "92801"
+      ProxyMerchantDoesNotExist = "92805"
+      VerifyCardRequiresCustomerId = "92802"
+      UnsupportedVersion = "92806"
+    end
+
+    module PaymentMethod
+      CustomerIdIsInvalid = "93105"
+      CustomerIdIsRequired = "93104"
+      NonceIsInvalid = "93102"
+      NonceIsRequired = "93103"
+      PaymentMethodParamsAreRequired = "93101"
+      CannotForwardPaymentMethodType = "93107"
+    end
+
+    module AuthorizationFingerprint
+      InvalidCreatedAt = "93204"
+      InvalidFormat = "93202"
+      InvalidPublicKey = "93205"
+      InvalidSignature = "93206"
+      MissingFingerprint = "93201"
+      OptionsNotAllowedWithoutCustomer = "93207"
+      SignatureRevoked = "93203"
+    end
   end
 end
 

data/lib/braintree/exceptions.rb

@@ -55,5 +55,7 @@ module Braintree # :nodoc:
       inspect
     end
   end
+
+  class TestOperationPerformedInProduction < BraintreeError; end
 end
 

data/lib/braintree/gateway.rb

@@ -41,10 +41,22 @@ module Braintree
       PlanGateway.new(self)
     end
 
+    def payment_method
+      PaymentMethodGateway.new(self)
+    end
+
+    def paypal_account
+      PayPalAccountGateway.new(self)
+    end
+
     def merchant_account
       MerchantAccountGateway.new(self)
     end
 
+    def sepa_bank_account
+      SEPABankAccountGateway.new(self)
+    end
+
     def settlement_batch_summary
       SettlementBatchSummaryGateway.new(self)
     end
@@ -61,6 +73,10 @@ module Braintree
       TransactionGateway.new(self)
     end
 
+    def testing
+      TestingGateway.new(self)
+    end
+
     def verification
       CreditCardVerificationGateway.new(self)
     end

data/lib/braintree/payment_instrument_type.rb

@@ -0,0 +1,7 @@
+module Braintree
+  module PaymentInstrumentType
+    PayPalAccount = 'paypal_account'
+    SEPABankAccount = 'sepa_bank_account'
+    CreditCard = 'credit_card'
+  end
+end