braintree 2.93.0 → 2.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7e71dc2faed60283e8b70c632dcc9f60c5402897caed595cf7689b6d8152c1
-  data.tar.gz: aa6b2334db4ee60824c5fd84d0a665f4709f328337fae8ee3f081c9237093148
+  metadata.gz: dce496fbd494eb6d7c00260e5f7ac5ce0082e588874e5ff85f8b1130009164c6
+  data.tar.gz: 827b5db86f4b2144bbbe795f2bbd2abd06b7f4c85d577e99842c544705b234d1
 SHA512:
-  metadata.gz: f50449f12b8e0c806a36a7111fd007c4d4bbc877a46dac3e50fe655e3258a6832983911f6354d0d361e59d4d2d9540b134f5f3fd45a0f6f8402b638a29b77229
-  data.tar.gz: f124d8089b885395f91fe95e88533fbe26e52e008a603cafd5ddb743b2abaee8b3416a6953c8a877a213503d8aeb95ffde7035694f67a8dd700e1af1fc7f06d7
+  metadata.gz: 2d879cf0a13d3d799ecf92f8f447e91a75897ecc77a75ee9ed1a39a5d96f81b7e82b4f6edfa57147e689230ea5941ecb5f92e1e4fb3e0f8524cb2d8a66542bf8
+  data.tar.gz: e402c7a9f7d351a89ad7c205012b26e66f9ca82ac15c73fc5ff432c2e00296dc78422ef8c2e80ad45d12f2e9901a8f343b9164736cecd3c578546316e0a26e0d

data/lib/braintree.rb

@@ -91,6 +91,7 @@ require "braintree/payment_method"
 require "braintree/payment_method_gateway"
 require "braintree/payment_method_nonce"
 require "braintree/payment_method_nonce_gateway"
+require "braintree/payment_method_parser"
 require "braintree/paypal_account"
 require "braintree/paypal_account_gateway"
 require "braintree/plan"
@@ -103,6 +104,7 @@ require "braintree/three_d_secure_info"
 require "braintree/settlement_batch_summary"
 require "braintree/settlement_batch_summary_gateway"
 require "braintree/resource_collection"
+require "braintree/revoked_payment_method_metadata"
 require "braintree/paginated_collection"
 require "braintree/paginated_result"
 require "braintree/europe_bank_account"

data/lib/braintree/error_codes.rb

@@ -177,6 +177,7 @@ module Braintree
       FileIsTooLarge = "84902"
       FileTypeIsInvalid = "84903"
       FileIsMalformedOrEncrypted = "84904"
+      FileIsTooLong = "84905"
     end
 
     module PayPalAccount

data/lib/braintree/payment_method_gateway.rb

@@ -19,36 +19,11 @@ module Braintree
 
     def _do_create(path, params=nil) # :nodoc:
       response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
-      if response[:credit_card]
-        SuccessfulResult.new(:payment_method => CreditCard._new(@gateway, response[:credit_card]))
-      elsif response[:paypal_account]
-        SuccessfulResult.new(:payment_method => PayPalAccount._new(@gateway, response[:paypal_account]))
-      elsif response[:coinbase_account]
-        SuccessfulResult.new(:payment_method => CoinbaseAccount._new(@gateway, response[:coinbase_account]))
-      elsif response[:us_bank_account]
-        SuccessfulResult.new(:payment_method => UsBankAccount._new(@gateway, response[:us_bank_account]))
-      elsif response[:apple_pay_card]
-        SuccessfulResult.new(:payment_method => ApplePayCard._new(@gateway, response[:apple_pay_card]))
-      elsif response[:android_pay_card]
-        SuccessfulResult.new(:payment_method => AndroidPayCard._new(@gateway, response[:android_pay_card]))
-      elsif response[:amex_express_checkout_card]
-        SuccessfulResult.new(:payment_method => AmexExpressCheckoutCard._new(@gateway, response[:amex_express_checkout_card]))
-      elsif response[:venmo_account]
-        SuccessfulResult.new(:payment_method => VenmoAccount._new(@gateway, response[:venmo_account]))
-      elsif response[:visa_checkout_card]
-        SuccessfulResult.new(:payment_method => VisaCheckoutCard._new(@gateway, response[:visa_checkout_card]))
-      elsif response[:masterpass_card]
-        SuccessfulResult.new(:payment_method => MasterpassCard._new(@gateway, response[:masterpass_card]))
-      elsif response[:samsung_pay_card]
-        SuccessfulResult.new(:payment_method => SamsungPayCard._new(@gateway, response[:samsung_pay_card]))
-      elsif response[:payment_method_nonce]
-        SuccessfulResult.new(:payment_method_nonce => PaymentMethodNonce._new(@gateway, response[:payment_method_nonce]))
-      elsif response[:success]
-        SuccessfulResult.new
-      elsif response[:api_error_response]
+
+      if response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])
       elsif response
-        SuccessfulResult.new(:payment_method => UnknownPaymentMethod._new(@gateway, response))
+        SuccessfulResult.new(:payment_method => PaymentMethodParser.parse_payment_method(@gateway, response))
       else
         raise UnexpectedError, "expected :payment_method or :api_error_response"
       end
@@ -96,6 +71,17 @@ module Braintree
       return_object_or_raise(:payment_method) { update(*args) }
     end
 
+    def _do_update(http_verb, path, params) # :nodoc:
+      response = @config.http.send(http_verb, "#{@config.base_merchant_path}#{path}", params)
+      if response[:api_error_response]
+        ErrorResult.new(@gateway, response[:api_error_response])
+      elsif response
+        SuccessfulResult.new(:payment_method => PaymentMethodParser.parse_payment_method(@gateway, response))
+      else
+        raise UnexpectedError, "expected :payment_method or :api_error_response"
+      end
+    end
+
     def grant(token, options = {})
       raise ArgumentError if token.nil? || token.to_s.strip == ""
       if  options.class == Hash
@@ -106,7 +92,7 @@ module Braintree
         raise ArgumentError
       end
 
-      _do_create(
+      _do_grant(
         "/payment_methods/grant",
         :payment_method => {
           :shared_payment_method_token => token,
@@ -116,10 +102,21 @@ module Braintree
       raise NotFoundError, "payment method with token #{token.inspect} not found"
     end
 
+    def _do_grant(path, params=nil)
+      response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
+      if response[:payment_method_nonce]
+        SuccessfulResult.new(:payment_method_nonce => PaymentMethodNonce._new(@gateway, response[:payment_method_nonce]))
+      elsif response[:api_error_response]
+        ErrorResult.new(@gateway, response[:api_error_response])
+      else
+        raise UnexpectedError, "expected :payment_method_nonce or :api_error_response"
+      end
+    end
+
     def revoke(token)
       raise ArgumentError if token.nil? || token.to_s.strip == ""
 
-      _do_create(
+      _do_revoke(
         "/payment_methods/revoke",
         :payment_method => {
           :shared_payment_method_token => token
@@ -129,22 +126,14 @@ module Braintree
       raise NotFoundError, "payment method with token #{token.inspect} not found"
     end
 
-    def _do_update(http_verb, path, params) # :nodoc:
-      response = @config.http.send(http_verb, "#{@config.base_merchant_path}#{path}", params)
-      if response[:credit_card]
-        SuccessfulResult.new(:payment_method => CreditCard._new(@gateway, response[:credit_card]))
-      elsif response[:paypal_account]
-        SuccessfulResult.new(:payment_method => PayPalAccount._new(@gateway, response[:paypal_account]))
-      elsif response[:coinbase_account]
-        SuccessfulResult.new(:payment_method => CoinbaseAccount._new(@gateway, response[:coinbase_account]))
+    def _do_revoke(path, params=nil)
+      response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
+      if response[:success]
+        SuccessfulResult.new
       elsif response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])
-      elsif response[:us_bank_account]
-        SuccessfulResult.new(:payment_method => UsBankAccount._new(@gateway, response[:us_bank_account]))
-      elsif response
-        SuccessfulResult.new(:payment_method => UnknownPaymentMethod._new(@gateway, response))
       else
-        raise UnexpectedError, "expected :payment_method or :api_error_response"
+        raise UnexpectedError, "expected :success or :api_error_response"
       end
     end
 

data/lib/braintree/payment_method_parser.rb

@@ -0,0 +1,32 @@
+module Braintree
+  module PaymentMethodParser
+
+    def self.parse_payment_method(gateway, attributes)
+      if attributes[:credit_card]
+        CreditCard._new(gateway, attributes[:credit_card])
+      elsif attributes[:paypal_account]
+        PayPalAccount._new(gateway, attributes[:paypal_account])
+      elsif attributes[:coinbase_account]
+        CoinbaseAccount._new(gateway, attributes[:coinbase_account])
+      elsif attributes[:us_bank_account]
+        UsBankAccount._new(gateway, attributes[:us_bank_account])
+      elsif attributes[:apple_pay_card]
+        ApplePayCard._new(gateway, attributes[:apple_pay_card])
+      elsif attributes[:android_pay_card]
+        AndroidPayCard._new(gateway, attributes[:android_pay_card])
+      elsif attributes[:amex_express_checkout_card]
+        AmexExpressCheckoutCard._new(gateway, attributes[:amex_express_checkout_card])
+      elsif attributes[:venmo_account]
+        VenmoAccount._new(gateway, attributes[:venmo_account])
+      elsif attributes[:visa_checkout_card]
+        VisaCheckoutCard._new(gateway, attributes[:visa_checkout_card])
+      elsif attributes[:masterpass_card]
+        MasterpassCard._new(gateway, attributes[:masterpass_card])
+      elsif attributes[:samsung_pay_card]
+        SamsungPayCard._new(gateway, attributes[:samsung_pay_card])
+      else
+        UnknownPaymentMethod._new(gateway, attributes)
+      end
+    end
+  end
+end

data/lib/braintree/revoked_payment_method_metadata.rb

@@ -0,0 +1,22 @@
+module Braintree
+  class RevokedPaymentMethodMetadata
+    include BaseModule
+
+    attr_reader :customer_id
+    attr_reader :token
+    attr_reader :revoked_payment_method
+
+    def initialize(gateway, attributes)
+      @revoked_payment_method = PaymentMethodParser.parse_payment_method(gateway, attributes)
+      @customer_id = @revoked_payment_method.customer_id
+      @token = @revoked_payment_method.token
+    end
+
+    class << self
+      protected :new
+      def _new(*args) # :nodoc:
+        self.new *args
+      end
+    end
+  end
+end

data/lib/braintree/util.rb

@@ -102,7 +102,7 @@ module Braintree
       when BigDecimal, NilClass
         decimal
       when String
-        BigDecimal.new(decimal)
+        BigDecimal(decimal)
       else
         raise ArgumentError, "Argument must be a String or BigDecimal"
       end

data/lib/braintree/version.rb

@@ -1,7 +1,7 @@
 module Braintree
   module Version
     Major = 2
-    Minor = 93
+    Minor = 94
     Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"

data/lib/braintree/webhook_notification.rb

@@ -41,6 +41,7 @@ module Braintree
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
 
       GrantedPaymentInstrumentUpdate = "granted_payment_instrument_update"
+      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
 
       LocalPaymentCompleted = "local_payment_completed"
     end
@@ -51,6 +52,7 @@ module Braintree
     attr_reader :disbursement
     attr_reader :dispute
     attr_reader :granted_payment_instrument_update
+    attr_reader :revoked_payment_method_metadata
     attr_reader :ideal_payment
     attr_reader :kind
     attr_reader :local_payment_completed
@@ -85,6 +87,7 @@ module Braintree
       @connected_merchant_status_transitioned = ConnectedMerchantStatusTransitioned._new(@subject[:connected_merchant_status_transitioned]) if @subject.has_key?(:connected_merchant_status_transitioned)
       @connected_merchant_paypal_status_changed = ConnectedMerchantPayPalStatusChanged._new(@subject[:connected_merchant_paypal_status_changed]) if @subject.has_key?(:connected_merchant_paypal_status_changed)
       @granted_payment_instrument_update = GrantedPaymentInstrumentUpdate._new(@subject[:granted_payment_instrument_update]) if @subject.has_key?(:granted_payment_instrument_update)
+      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if @kind == Kind::GrantedPaymentInstrumentRevoked
       @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment)
     end
 

data/spec/integration/braintree/add_on_spec.rb

@@ -21,7 +21,7 @@ describe Braintree::AddOn do
       add_on = add_ons.select { |add_on| add_on.id == id }.first
 
       add_on.should_not be_nil
-      add_on.amount.should == BigDecimal.new(expected[:amount])
+      add_on.amount.should == BigDecimal(expected[:amount])
       add_on.created_at.should_not be_nil
       add_on.description.should == expected[:description]
       add_on.kind.should == expected[:kind]

data/spec/integration/braintree/credit_card_spec.rb

@@ -592,7 +592,7 @@ describe Braintree::CreditCard do
         :amount => "100.00"
       )
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "credit"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -614,7 +614,7 @@ describe Braintree::CreditCard do
         customer.credit_cards[0].token,
         :amount => "100.00"
       )
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "credit"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1064,7 +1064,7 @@ describe Braintree::CreditCard do
         :amount => "100.00"
       )
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "credit"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1083,7 +1083,7 @@ describe Braintree::CreditCard do
         }
       )
       transaction = customer.credit_cards[0].credit!(:amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "credit"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1208,7 +1208,7 @@ describe Braintree::CreditCard do
       found_card.subscriptions.first.id.should == subscription.id
       found_card.subscriptions.first.plan_id.should == "integration_trialless_plan"
       found_card.subscriptions.first.payment_method_token.should == credit_card.token
-      found_card.subscriptions.first.price.should == BigDecimal.new("1.00")
+      found_card.subscriptions.first.price.should == BigDecimal("1.00")
     end
 
     it "raises a NotFoundError exception if payment method cannot be found" do
@@ -1295,7 +1295,7 @@ describe Braintree::CreditCard do
       result = Braintree::CreditCard.sale(customer.credit_cards[0].token, :amount => "100.00")
 
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "sale"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1319,7 +1319,7 @@ describe Braintree::CreditCard do
       )
 
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "sale"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1336,7 +1336,7 @@ describe Braintree::CreditCard do
         }
       )
       transaction = Braintree::CreditCard.sale!(customer.credit_cards[0].token, :amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "sale"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1358,7 +1358,7 @@ describe Braintree::CreditCard do
         :amount => "100.00"
       )
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "sale"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -1377,7 +1377,7 @@ describe Braintree::CreditCard do
         }
       )
       transaction = customer.credit_cards[0].sale!(:amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "sale"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token

data/spec/integration/braintree/customer_spec.rb

@@ -531,7 +531,7 @@ describe Braintree::Customer do
       )
       result = Braintree::Customer.credit(customer.id, :amount => "100.00")
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "credit"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -550,7 +550,7 @@ describe Braintree::Customer do
         }
       )
       transaction = Braintree::Customer.credit!(customer.id, :amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "credit"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -570,7 +570,7 @@ describe Braintree::Customer do
       )
       result = Braintree::Customer.sale(customer.id, :amount => "100.00")
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "sale"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -589,7 +589,7 @@ describe Braintree::Customer do
         }
       )
       transaction = Braintree::Customer.sale!(customer.id, :amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "sale"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -626,7 +626,7 @@ describe Braintree::Customer do
         :amount => "100.00"
       )
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "sale"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -645,7 +645,7 @@ describe Braintree::Customer do
         }
       )
       transaction = customer.sale!(:amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "sale"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -681,7 +681,7 @@ describe Braintree::Customer do
         :amount => "100.00"
       )
       result.success?.should == true
-      result.transaction.amount.should == BigDecimal.new("100.00")
+      result.transaction.amount.should == BigDecimal("100.00")
       result.transaction.type.should == "credit"
       result.transaction.customer_details.id.should == customer.id
       result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -700,7 +700,7 @@ describe Braintree::Customer do
         }
       )
       transaction = customer.credit!(:amount => "100.00")
-      transaction.amount.should == BigDecimal.new("100.00")
+      transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "credit"
       transaction.customer_details.id.should == customer.id
       transaction.credit_card_details.token.should == customer.credit_cards[0].token
@@ -820,7 +820,7 @@ describe Braintree::Customer do
       found_customer.credit_cards.first.subscriptions.first.id.should == subscription.id
       found_customer.credit_cards.first.subscriptions.first.plan_id.should == "integration_trialless_plan"
       found_customer.credit_cards.first.subscriptions.first.payment_method_token.should == credit_card.token
-      found_customer.credit_cards.first.subscriptions.first.price.should == BigDecimal.new("1.00")
+      found_customer.credit_cards.first.subscriptions.first.price.should == BigDecimal("1.00")
     end
 
     context "when given an association filter id" do

data/spec/integration/braintree/discount_spec.rb

@@ -21,7 +21,7 @@ describe Braintree::Discount do
       discount = discounts.select { |discount| discount.id == id }.first
 
       discount.should_not be_nil
-      discount.amount.should == BigDecimal.new(expected[:amount])
+      discount.amount.should == BigDecimal(expected[:amount])
       discount.created_at.should_not be_nil
       discount.description.should == expected[:description]
       discount.kind.should == expected[:kind]

data/spec/integration/braintree/document_upload_spec.rb

@@ -46,6 +46,13 @@ describe Braintree::DocumentUploadGateway do
       end
     end
 
+    it "returns file too long error with file over 50 pages" do
+      filename = "#{File.dirname(__FILE__)}/../../fixtures/files/too_long.pdf"
+      file = File.new(filename, "r")
+      response = Braintree::DocumentUpload.create({:kind => Braintree::DocumentUpload::Kind::EvidenceDocument, :file => file})
+      response.errors.for(:document_upload).first.code.should == Braintree::ErrorCodes::DocumentUpload::FileIsTooLong
+    end
+
     it "returns invalid keys error if signature is invalid" do
       expect do
         response = Braintree::DocumentUpload.create({:invalid_key => "do not add", :kind => Braintree::DocumentUpload::Kind::EvidenceDocument})