braintree 2.104.1 → 3.4.0

data/lib/braintree/exceptions.rb

@@ -8,9 +8,7 @@ module Braintree # :nodoc:
 
   class ConfigurationError < BraintreeError; end
 
-  class DownForMaintenanceError < BraintreeError; end
-
-  class ForgedQueryString < BraintreeError; end
+  class GatewayTimeoutError < BraintreeError; end
 
   class InvalidSignature < BraintreeError; end
 
@@ -18,8 +16,12 @@ module Braintree # :nodoc:
 
   class NotFoundError < BraintreeError; end
 
+  class RequestTimeoutError < BraintreeError; end
+
   class ServerError < BraintreeError; end
 
+  class ServiceUnavailableError < BraintreeError; end
+
   class SSLCertificateError < BraintreeError; end
 
   class TooManyRequestsError < BraintreeError; end

data/lib/braintree/gateway.rb

@@ -74,12 +74,6 @@ module Braintree
       UsBankAccountGateway.new(self)
     end
 
-    # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-    # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-    def ideal_payment
-      IdealPaymentGateway.new(self)
-    end
-
     def merchant
       MerchantGateway.new(self)
     end
@@ -88,10 +82,6 @@ module Braintree
       MerchantAccountGateway.new(self)
     end
 
-    def europe_bank_account
-      EuropeBankAccountGateway.new(self)
-    end
-
     def settlement_batch_summary
       SettlementBatchSummaryGateway.new(self)
     end
@@ -100,10 +90,6 @@ module Braintree
       SubscriptionGateway.new(self)
     end
 
-    def transparent_redirect
-      TransparentRedirectGateway.new(self)
-    end
-
     def transaction
       TransactionGateway.new(self)
     end

data/lib/braintree/{android_pay_card.rb → google_pay_card.rb}

@@ -1,6 +1,5 @@
 module Braintree
-  # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-  class AndroidPayCard
+  class GooglePayCard
     include BaseModule # :nodoc:
 
     attr_reader :bin
@@ -47,7 +46,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/granted_payment_instrument_update.rb

@@ -16,7 +16,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/graphql_client.rb

@@ -4,9 +4,9 @@ module Braintree
     def initialize(config)
       @config = config
       @graphql_headers = {
-        'Accept' => 'application/json',
-        'Braintree-Version' => @config.graphql_api_version,
-        'Content-Type' => 'application/json'
+        "Accept" => "application/json",
+        "Braintree-Version" => @config.graphql_api_version,
+        "Content-Type" => "application/json"
       }
     end
 
@@ -14,9 +14,9 @@ module Braintree
       graphql_connection = _setup_connection(@config.graphql_server, @config.graphql_port)
 
       request = {}
-      request['query'] = definition
-      request['operationName'] = operationName if operationName
-      request['variables'] = variables
+      request["query"] = definition
+      request["operationName"] = operationName if operationName
+      request["variables"] = variables
 
       response = _http_do Net::HTTP::Post, @config.graphql_base_url, request.to_json, nil, graphql_connection, @graphql_headers
       data = _parse_response(response)
@@ -27,7 +27,7 @@ module Braintree
 
     def _parse_response(response)
       body = response.body
-      body = Zlib::GzipReader.new(StringIO.new(body)).read if response.header['Content-Encoding'] == "gzip"
+      body = Zlib::GzipReader.new(StringIO.new(body)).read if response.header["Content-Encoding"] == "gzip"
       JSON.parse(body, :symbolize_names => true)
     end
   end

data/lib/braintree/http.rb

@@ -75,7 +75,7 @@ module Braintree
           @config.proxy_address,
           @config.proxy_port,
           @config.proxy_user,
-          @config.proxy_pass
+          @config.proxy_pass,
         )
       else
         connection = Net::HTTP.new(server, port)
@@ -127,7 +127,7 @@ module Braintree
               form_params.push(_add_form_field(k, v))
             end
             form_params.push(_add_file_part("file", file))
-            request.body = form_params.collect {|p| "--" + boundary + "#{LINE_FEED}" + p}.join("") + "--" + boundary + "--"
+            request.body = form_params.collect { |p| "--" + boundary + "#{LINE_FEED}" + p }.join("") + "--" + boundary + "--"
             @config.logger.debug _format_and_sanitize_body_for_log(_build_xml(body))
           else
             request.body = body
@@ -187,7 +187,7 @@ module Braintree
     def _format_and_sanitize_body_for_log(input_xml)
       formatted_xml = input_xml.gsub(/^/, "[Braintree] ")
       formatted_xml = formatted_xml.gsub(/<number>(.{6}).+?(.{4})<\/number>/m, '<number>\1******\2</number>')
-      formatted_xml = formatted_xml.gsub(/<cvv>.+?<\/cvv>/m, '<cvv>***</cvv>')
+      formatted_xml = formatted_xml.gsub(/<cvv>.+?<\/cvv>/m, "<cvv>***</cvv>")
       formatted_xml
     end
 

data/lib/braintree/local_payment_completed.rb

@@ -17,7 +17,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/local_payment_reversed.rb

@@ -0,0 +1,19 @@
+module Braintree
+  class LocalPaymentReversed
+    include BaseModule
+
+    attr_reader :payment_id
+
+    def initialize(attributes) # :nodoc:
+      set_instance_variables_from_hash(attributes)
+    end
+
+    class << self
+      protected :new
+    end
+
+    def self._new(*args) # :nodoc:
+      self.new(*args)
+    end
+  end
+end

data/lib/braintree/merchant.rb

@@ -24,7 +24,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
 
     def self.provision_raw_apple_pay

data/lib/braintree/merchant_account.rb

@@ -61,7 +61,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
 

data/lib/braintree/merchant_account_gateway.rb

@@ -74,7 +74,7 @@ module Braintree
 
       if response.has_key?(:response) && response[:response][:merchant_account]
         Braintree::SuccessfulResult.new(
-          :merchant_account => MerchantAccount._new(@gateway, response[:response][:merchant_account])
+          :merchant_account => MerchantAccount._new(@gateway, response[:response][:merchant_account]),
         )
       elsif response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])
@@ -83,6 +83,7 @@ module Braintree
       end
     end
 
+    # this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
     def self._detect_signature(attributes)
       if attributes.has_key?(:applicant_details)
         warn "[DEPRECATED] Passing :applicant_details to create is deprecated. Please use :individual, :business, and :funding."
@@ -92,6 +93,7 @@ module Braintree
       end
     end
 
+    # this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
     def self._deprecated_create_signature # :nodoc:
       [
         {:applicant_details => [

data/lib/braintree/merchant_gateway.rb

@@ -26,7 +26,7 @@ module Braintree
       if response.has_key?(:response) && response[:response][:merchant]
         Braintree::SuccessfulResult.new(
           :merchant => Merchant._new(@gateway, response[:response][:merchant]),
-          :credentials => OAuthCredentials._new(response[:response][:credentials])
+          :credentials => OAuthCredentials._new(response[:response][:credentials]),
         )
       elsif response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])

data/lib/braintree/modification.rb

@@ -18,7 +18,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
 

data/lib/braintree/oauth_credentials.rb

@@ -16,7 +16,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/oauth_gateway.rb

@@ -22,7 +22,7 @@ module Braintree
       })
       if response[:credentials]
         Braintree::SuccessfulResult.new(
-          :credentials => OAuthCredentials._new(response[:credentials])
+          :credentials => OAuthCredentials._new(response[:credentials]),
         )
       elsif response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])
@@ -47,10 +47,10 @@ module Braintree
       user_params = _sub_query(params, :user)
       business_params = _sub_query(params, :business)
       payment_methods = _sub_array_query(params, :payment_methods)
-      query = params.to_a.
-        concat(user_params).
-        concat(business_params).
-        concat(payment_methods)
+      query = params.to_a
+        .concat(user_params)
+        .concat(business_params)
+        .concat(payment_methods)
 
       query_string = query.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
       "#{@config.base_url}/oauth/connect?#{query_string}"

data/lib/braintree/payment_instrument_type.rb

@@ -1,18 +1,14 @@
 module Braintree
   module PaymentInstrumentType
-    PayPalAccount = 'paypal_account'
-    EuropeBankAccount = 'europe_bank_account'
-    CreditCard = 'credit_card'
-    CoinbaseAccount = 'coinbase_account'
-    ApplePayCard = 'apple_pay_card'
-    # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-    AndroidPayCard = 'android_pay_card'
-    VenmoAccount = 'venmo_account'
-    UsBankAccount = 'us_bank_account'
-    VisaCheckoutCard = 'visa_checkout_card'
-    MasterpassCard = 'masterpass_card' # Deprecated
-    SamsungPayCard = 'samsung_pay_card'
-    LocalPayment = 'local_payment'
-    PayPalHere = 'paypal_here'
+    PayPalAccount = "paypal_account"
+    CreditCard = "credit_card"
+    ApplePayCard = "apple_pay_card"
+    GooglePayCard = "android_pay_card"
+    VenmoAccount = "venmo_account"
+    UsBankAccount = "us_bank_account"
+    VisaCheckoutCard = "visa_checkout_card"
+    SamsungPayCard = "samsung_pay_card"
+    LocalPayment = "local_payment"
+    PayPalHere = "paypal_here"
   end
 end

data/lib/braintree/payment_method_gateway.rb

@@ -19,7 +19,6 @@ module Braintree
 
     def _do_create(path, params=nil) # :nodoc:
       response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
-
       if response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])
       elsif response
@@ -43,17 +42,12 @@ module Braintree
         CreditCard._new(@gateway, response[:credit_card])
       elsif response.has_key?(:paypal_account)
         PayPalAccount._new(@gateway, response[:paypal_account])
-      elsif response[:coinbase_account]
-        SuccessfulResult.new(:payment_method => CoinbaseAccount._new(@gateway, response[:coinbase_account]))
       elsif response.has_key?(:us_bank_account)
         UsBankAccount._new(@gateway, response[:us_bank_account])
-      elsif response.has_key?(:europe_bank_account)
-        EuropeBankAccount._new(@gateway, response[:europe_bank_account])
       elsif response.has_key?(:apple_pay_card)
         ApplePayCard._new(@gateway, response[:apple_pay_card])
       elsif response.has_key?(:android_pay_card)
-        # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-        AndroidPayCard._new(@gateway, response[:android_pay_card])
+        GooglePayCard._new(@gateway, response[:android_pay_card])
       elsif response.has_key?(:venmo_account)
         VenmoAccount._new(@gateway, response[:venmo_account])
       else
@@ -88,7 +82,7 @@ module Braintree
       if  options.class == Hash
         grant_options = options
       elsif [true, false].include?(options)
-        grant_options = { :allow_vaulting => options }
+        grant_options = {:allow_vaulting => options}
       else
         raise ArgumentError
       end
@@ -97,7 +91,7 @@ module Braintree
         "/payment_methods/grant",
         :payment_method => {
           :shared_payment_method_token => token,
-        }.merge(grant_options)
+        }.merge(grant_options),
       )
     rescue NotFoundError
       raise NotFoundError, "payment method with token #{token.inspect} not found"
@@ -121,7 +115,7 @@ module Braintree
         "/payment_methods/revoke",
         :payment_method => {
           :shared_payment_method_token => token
-        }
+        },
       )
     rescue NotFoundError
       raise NotFoundError, "payment method with token #{token.inspect} not found"
@@ -157,6 +151,7 @@ module Braintree
         :make_default, :verification_merchant_account_id, :verify_card, :venmo_sdk_session,
         :verification_amount, :us_bank_account_verification_method,
         :verification_account_type,
+        :verification_currency_iso_code,
         :paypal => [
           :payee_email,
           :order_id,
@@ -167,9 +162,9 @@ module Braintree
         ],
       ]
       signature = [
-        :billing_address_id, :cardholder_name, :cvv, :device_session_id, :expiration_date,
-        :expiration_month, :expiration_year, :number, :token, :venmo_sdk_payment_method_code,
-        :device_data, :fraud_merchant_id, :payment_method_nonce,
+        :billing_address_id, :cardholder_name, :cvv, :expiration_date, :expiration_month,
+        :expiration_year, :number, :token, :venmo_sdk_payment_method_code, :device_data,
+        :payment_method_nonce,
         {:options => options},
         {:billing_address => billing_address_params}
       ]

data/lib/braintree/payment_method_nonce_gateway.rb

@@ -8,7 +8,7 @@ module Braintree
       @config.assert_has_access_token_or_keys
     end
 
-    def create(payment_method_token, args = { payment_method_nonce: {} })
+    def create(payment_method_token, args = {payment_method_nonce: {}})
       Util.verify_keys(PaymentMethodNonceGateway._create_signature, args)
 
       response = @config.http.post("#{@config.base_merchant_path}/payment_methods/#{payment_method_token}/nonces", args)

data/lib/braintree/payment_method_parser.rb

@@ -6,23 +6,16 @@ module Braintree
         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]
-        # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-        AndroidPayCard._new(gateway, attributes[:android_pay_card])
-      elsif attributes[:amex_express_checkout_card]
-        AmexExpressCheckoutCard._new(gateway, attributes[:amex_express_checkout_card])
+        GooglePayCard._new(gateway, attributes[:android_pay_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

data/lib/braintree/plan.rb

@@ -36,7 +36,7 @@ module Braintree
     end
 
     def self._new(*args)
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/processor_response_types.rb

@@ -1,7 +1,7 @@
 module Braintree
   module ProcessorResponseTypes
-    Approved = 'approved'
-    SoftDeclined = 'soft_declined'
-    HardDeclined = 'hard_declined'
+    Approved = "approved"
+    SoftDeclined = "soft_declined"
+    HardDeclined = "hard_declined"
   end
 end

data/lib/braintree/resource_collection.rb

@@ -22,9 +22,14 @@ module Braintree
       @ids.empty?
     end
 
-    # Returns the first item in the collection or nil if the collection is empty
-    def first
-      @paging_block.call([@ids.first]).first
+    # Returns the first or the first N items in the collection or nil if the collection is empty
+    def first(amount = 1)
+      return nil if @ids.empty?
+      return @paging_block.call([@ids.first]).first if amount == 1
+
+      @ids.first(amount).each_slice(@page_size).flat_map do |page_of_ids|
+        @paging_block.call(page_of_ids)
+      end
     end
 
     # Only the maximum size of a resource collection can be determined since the data on the server can change while