braintree 2.98.0 → 4.23.0

data/lib/braintree/util.rb

@@ -1,5 +1,5 @@
 module Braintree
-  module Util # :nodoc:
+  module Util
     def self.extract_attribute_as_array(hash, attribute)
       raise UnexpectedError.new("Unprocessable entity due to an invalid request") if hash.nil?
       value = hash.has_key?(attribute) ? hash.delete(attribute) : []
@@ -14,13 +14,13 @@ module Braintree
         else
           url_encode(full_key) + "=" + url_encode(value)
         end
-      end.sort * '&'
+      end.sort * "&"
     end
 
     def self.parse_query_string(qs)
-      qs.split('&').inject({}) do |result, couplet|
-        pair = couplet.split('=')
-        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || '')
+      qs.split("&").inject({}) do |result, couplet|
+        pair = couplet.split("=")
+        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || "")
         result
       end
     end
@@ -53,6 +53,8 @@ module Braintree
         raise AuthorizationError, message
       when 404
         raise NotFoundError
+      when 408
+        raise RequestTimeoutError
       when 426
         raise UpgradeRequiredError, "Please upgrade your client library."
       when 429
@@ -60,7 +62,9 @@ module Braintree
       when 500
         raise ServerError
       when 503
-        raise DownForMaintenanceError
+        raise ServiceUnavailableError
+      when 504
+        raise GatewayTimeoutError
       else
         raise UnexpectedError, "Unexpected HTTP_RESPONSE #{status_code.to_i}"
       end
@@ -87,7 +91,7 @@ module Braintree
           when "INTERNAL"
             raise ServerError
           when "SERVICE_AVAILABILITY"
-            raise DownForMaintenanceError
+            raise ServiceUnavailableError
           else
             raise UnexpectedError, "Unexpected Response: #{error[:message]}"
           end
@@ -126,6 +130,17 @@ module Braintree
       !invalid_keys.any?
     end
 
+    def self.replace_key(hash, target_key, replacement_key)
+      hash.inject({}) do |new_hash, (key, value)|
+        if value.is_a?(Hash)
+          value = replace_key(value, target_key, replacement_key)
+        end
+
+        key = replacement_key if key == target_key
+        new_hash.merge(key => value)
+      end
+    end
+
     def self._flatten_valid_keys(valid_keys, namespace = nil)
       valid_keys.inject([]) do |result, key|
         if key.is_a?(Hash)
@@ -176,18 +191,18 @@ module Braintree
     def self._get_invalid_keys(valid_keys, hash)
       flattened_valid_keys = _flatten_valid_keys(valid_keys)
       keys = _flatten_hash_keys(hash) - flattened_valid_keys
-      keys = _remove_wildcard_keys(flattened_valid_keys, keys)
+      _remove_wildcard_keys(flattened_valid_keys, keys)
     end
 
     module IdEquality
-      def ==(other) # :nodoc:
+      def ==(other)
         return false unless other.is_a?(self.class)
         id == other.id
       end
     end
 
     module TokenEquality
-      def ==(other) # :nodoc:
+      def ==(other)
         return false unless other.is_a?(self.class)
         token == other.token
       end

data/lib/braintree/validation_error.rb

@@ -18,7 +18,7 @@ module Braintree
       set_instance_variables_from_hash error_hash
     end
 
-    def inspect # :nodoc:
+    def inspect
       "#<#{self.class} (#{code}) #{message}>"
     end
   end

data/lib/braintree/validation_error_collection.rb

@@ -2,7 +2,7 @@ module Braintree
   class ValidationErrorCollection
     include Enumerable
 
-    def initialize(data) # :nodoc:
+    def initialize(data)
       return if !data.is_a? Hash
       @errors = (data[:errors] || {}).map { |hash| Braintree::ValidationError.new(hash) }
       @nested = {}
@@ -42,7 +42,7 @@ module Braintree
       self.for("index_#{index}".to_sym)
     end
 
-    def inspect # :nodoc:
+    def inspect
       "#<#{self.class} errors#{_inner_inspect}>"
     end
 
@@ -61,7 +61,7 @@ module Braintree
       @errors.size
     end
 
-    def _inner_inspect(scope = []) # :nodoc:
+    def _inner_inspect(scope = [])
       all = []
       scope_string = scope.join("/")
       if @errors.any?

data/lib/braintree/venmo_account.rb

@@ -1,6 +1,6 @@
 module Braintree
   class VenmoAccount
-    include BaseModule # :nodoc:
+    include BaseModule
 
     attr_reader :created_at
     attr_reader :customer_id
@@ -13,7 +13,7 @@ module Braintree
     attr_reader :username
     attr_reader :venmo_user_id
 
-    def initialize(gateway, attributes) # :nodoc:
+    def initialize(gateway, attributes)
       @gateway = gateway
       set_instance_variables_from_hash(attributes)
       @subscriptions = (@subscriptions || []).map { |subscription_hash| Subscription._new(@gateway, subscription_hash) }
@@ -27,8 +27,8 @@ module Braintree
       protected :new
     end
 
-    def self._new(*args) # :nodoc:
-      self.new *args
+    def self._new(*args)
+      self.new(*args)
     end
   end
 end

data/lib/braintree/venmo_profile_data.rb

@@ -0,0 +1,25 @@
+module Braintree
+  class VenmoProfileData
+    include BaseModule
+
+    attr_reader :billing_address
+    attr_reader :email
+    attr_reader :first_name
+    attr_reader :last_name
+    attr_reader :phone_number
+    attr_reader :shipping_address
+    attr_reader :username
+
+    def initialize(attributes)
+      set_instance_variables_from_hash(attributes)
+    end
+
+    class << self
+      protected :new
+    end
+
+    def self._new(*args)
+      self.new(*args)
+    end
+  end
+end

data/lib/braintree/version.rb

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

data/lib/braintree/visa_checkout_card.rb

@@ -1,6 +1,6 @@
 module Braintree
   class VisaCheckoutCard
-    include BaseModule # :nodoc:
+    include BaseModule
     include Braintree::Util::TokenEquality
 
     attr_reader :billing_address
@@ -30,7 +30,7 @@ module Braintree
     attr_reader :updated_at
     attr_reader :verification
 
-    def initialize(gateway, attributes) # :nodoc:
+    def initialize(gateway, attributes)
       @gateway = gateway
       set_instance_variables_from_hash(attributes)
       @billing_address = attributes[:billing_address] ? Address._new(@gateway, attributes[:billing_address]) : nil
@@ -39,8 +39,8 @@ module Braintree
     end
 
     def _most_recent_verification(attributes)
-      verification = (attributes[:verifications] || []).sort_by{ |verification| verification[:created_at] }.reverse.first
-      CreditCardVerification._new(verification) if verification
+      sorted_verifications = (attributes[:verifications] || []).sort_by { |verification| verification[:created_at] }.reverse.first
+      CreditCardVerification._new(sorted_verifications) if sorted_verifications
     end
 
     def default?
@@ -56,7 +56,7 @@ module Braintree
       @expired
     end
 
-    def inspect # :nodoc:
+    def inspect
       first = [:token]
       order = first + (self.class._attributes - first)
       nice_attributes = order.map do |attr|
@@ -73,7 +73,7 @@ module Braintree
       protected :new
     end
 
-    def self._attributes # :nodoc:
+    def self._attributes
       [
         :billing_address, :bin, :card_type, :cardholder_name, :created_at,
         :customer_id, :customer_location, :expiration_month, :expiration_year,
@@ -83,8 +83,8 @@ module Braintree
       ]
     end
 
-    def self._new(*args) # :nodoc:
-      self.new *args
+    def self._new(*args)
+      self.new(*args)
     end
   end
 end

data/lib/braintree/webhook_notification.rb

@@ -1,19 +1,54 @@
-require 'ostruct'
+require "ostruct"
 
 module Braintree
   class WebhookNotification
     include BaseModule
 
     module Kind
+
+      AccountUpdaterDailyReport = "account_updater_daily_report"
+
       Check = "check"
 
+      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
+      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       Disbursement = "disbursement"
       DisbursementException = "disbursement_exception"
 
-      DisputeOpened = "dispute_opened"
+      DisputeAccepted = "dispute_accepted"
+      DisputeAutoAccepted = "dispute_auto_accepted"
+      DisputeDisputed = "dispute_disputed"
+      DisputeExpired = "dispute_expired"
       DisputeLost = "dispute_lost"
+      DisputeOpened = "dispute_opened"
+      DisputeUnderReview = "dispute_under_review"
       DisputeWon = "dispute_won"
 
+      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
+
+      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
+      GrantedPaymentMethodRevoked = "granted_payment_method_revoked"
+
+      LocalPaymentCompleted = "local_payment_completed"
+      LocalPaymentExpired = "local_payment_expired"
+      LocalPaymentFunded = "local_payment_funded"
+      LocalPaymentReversed = "local_payment_reversed"
+
+      OAuthAccessRevoked = "oauth_access_revoked"
+
+      PartnerMerchantConnected = "partner_merchant_connected"
+      PartnerMerchantDisconnected = "partner_merchant_disconnected"
+      PartnerMerchantDeclined = "partner_merchant_declined"
+
+      PaymentMethodCustomerDataUpdated = "payment_method_customer_data_updated"
+
+      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
+
+      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
+
+      RefundFailed = "refund_failed"
+
+      SubscriptionBillingSkipped = "subscription_billing_skipped"
       SubscriptionCanceled = "subscription_canceled"
       SubscriptionChargedSuccessfully = "subscription_charged_successfully"
       SubscriptionChargedUnsuccessfully = "subscription_charged_unsuccessfully"
@@ -24,33 +59,11 @@ module Braintree
 
       SubMerchantAccountApproved = "sub_merchant_account_approved"
       SubMerchantAccountDeclined = "sub_merchant_account_declined"
+
       TransactionDisbursed = "transaction_disbursed"
+      TransactionReviewed = "transaction_reviewed"
       TransactionSettlementDeclined = "transaction_settlement_declined"
       TransactionSettled = "transaction_settled"
-      PartnerMerchantConnected = "partner_merchant_connected"
-      PartnerMerchantDisconnected = "partner_merchant_disconnected"
-      PartnerMerchantDeclined = "partner_merchant_declined"
-
-      AccountUpdaterDailyReport = "account_updater_daily_report"
-
-      # 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.
-      IdealPaymentComplete = "ideal_payment_complete"
-      IdealPaymentFailed = "ideal_payment_failed"
-
-      OAuthAccessRevoked = "oauth_access_revoked"
-      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
-      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
-
-      # NEXT_MAJOR_VERSION remove GrantedPaymentInstrumentUpdate. Kind is not sent by Braintree Gateway.
-      # Kind will either be GrantorUpdatedGrantedPaymentMethod or RecipientUpdatedGrantedPaymentMethod.
-      GrantedPaymentInstrumentUpdate = "granted_payment_instrument_update"
-      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
-      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
-      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
-      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
-
-      LocalPaymentCompleted = "local_payment_completed"
     end
 
     attr_reader :account_updater_daily_report
@@ -60,15 +73,19 @@ module Braintree
     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
+    attr_reader :local_payment_expired
+    attr_reader :local_payment_funded
+    attr_reader :local_payment_reversed
     attr_reader :oauth_access_revocation
     attr_reader :partner_merchant
+    attr_reader :payment_method_customer_data_updated_metadata
     attr_reader :source_merchant_id
     attr_reader :subscription
     attr_reader :timestamp
     attr_reader :transaction
+    attr_reader :transaction_review
 
     def self.parse(*args)
       Configuration.gateway.webhook_notification.parse(*args)
@@ -78,7 +95,7 @@ module Braintree
       Configuration.gateway.webhook_notification.verify(*args)
     end
 
-    def initialize(gateway, attributes) # :nodoc:
+    def initialize(gateway, attributes)
       @gateway = gateway
       set_instance_variables_from_hash(attributes)
       @error_result = ErrorResult.new(gateway, @subject[:api_error_response]) if @subject.has_key?(:api_error_response)
@@ -87,15 +104,20 @@ module Braintree
       @oauth_access_revocation = OpenStruct.new(@subject[:oauth_application_revocation]) if @subject.has_key?(:oauth_application_revocation)
       @subscription = Subscription._new(gateway, @subject[:subscription]) if @subject.has_key?(:subscription)
       @transaction = Transaction._new(gateway, @subject[:transaction]) if @subject.has_key?(:transaction)
+      @transaction_review = OpenStruct.new(@subject[:transaction_review]) if @subject.has_key?(:transaction_review)
       @disbursement = Disbursement._new(gateway, @subject[:disbursement]) if @subject.has_key?(:disbursement)
       @dispute = Dispute._new(@subject[:dispute]) if @subject.has_key?(:dispute)
       @account_updater_daily_report = AccountUpdaterDailyReport._new(@subject[:account_updater_daily_report]) if @subject.has_key?(:account_updater_daily_report)
-      @ideal_payment = Braintree::IdealPayment._new(gateway, @subject[:ideal_payment]) if @subject.has_key?(:ideal_payment)
       @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::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer].include?(@kind)
-      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment)
+      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer, Kind::GrantedPaymentMethodRevoked].include?(@kind)
+      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment) && Kind::LocalPaymentCompleted == @kind
+      @local_payment_expired = LocalPaymentExpired._new(@subject[:local_payment_expired]) if @subject.has_key?(:local_payment_expired) && Kind::LocalPaymentExpired == @kind
+      @local_payment_funded = LocalPaymentFunded._new(@subject[:local_payment_funded]) if @subject.has_key?(:local_payment_funded) && Kind::LocalPaymentFunded == @kind
+      @local_payment_reversed = LocalPaymentReversed._new(@subject[:local_payment_reversed]) if @subject.has_key?(:local_payment_reversed) && Kind::LocalPaymentReversed == @kind
+      @payment_method_customer_data_updated_metadata = PaymentMethodCustomerDataUpdatedMetadata._new(gateway, @subject[:payment_method_customer_data_updated_metadata]) if @subject.has_key?(:payment_method_customer_data_updated_metadata) && Kind::PaymentMethodCustomerDataUpdated == @kind
+
     end
 
     def merchant_account
@@ -116,8 +138,8 @@ module Braintree
 
     class << self
       protected :new
-      def _new(*args) # :nodoc:
-        self.new *args
+      def _new(*args)
+        self.new(*args)
       end
     end
   end

data/lib/braintree/webhook_notification_gateway.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class WebhookNotificationGateway # :nodoc:
+  class WebhookNotificationGateway
     def initialize(gateway)
       @gateway = gateway
       @config = gateway.config
@@ -7,8 +7,8 @@ module Braintree
     end
 
     def parse(signature_string, payload)
-      raise InvalidSignature, 'signature cannot be nil' if signature_string.nil?
-      raise InvalidSignature, 'payload cannot be nil' if payload.nil?
+      raise InvalidSignature, "signature cannot be nil" if signature_string.nil?
+      raise InvalidSignature, "payload cannot be nil" if payload.nil?
       if payload =~ /[^A-Za-z0-9+=\/\n]/
         raise InvalidSignature, "payload contains illegal characters"
       end
@@ -18,7 +18,7 @@ module Braintree
     end
 
     def verify(challenge)
-      raise InvalidChallenge, 'challenge contains non-hex characters' unless challenge =~ /\A[a-f0-9]{20,32}\z/
+      raise InvalidChallenge, "challenge contains non-hex characters" unless challenge =~ /\A[a-f0-9]{20,32}\z/
       digest = Braintree::Digest.hexdigest(@config.private_key, challenge)
       "#{@config.public_key}|#{digest}"
     end
@@ -27,20 +27,20 @@ module Braintree
       signature_pairs = signature_string.split("&")
       valid_pairs = signature_pairs.select { |pair| pair.include?("|") }.map { |pair| pair.split("|") }
 
-      valid_pairs.detect do |public_key, signature|
+      valid_pairs.detect do |public_key, _signature|
         public_key == @config.public_key
       end
     end
 
     def _verify_signature(signature_string, payload)
       public_key, signature = _matching_signature_pair(signature_string)
-      raise InvalidSignature, 'no matching public key' if public_key.nil?
+      raise InvalidSignature, "no matching public key" if public_key.nil?
 
-      signature_matches = [payload, payload + "\n"].any? do |payload|
-        payload_signature = Braintree::Digest.hexdigest(@config.private_key, payload)
+      signature_matches = [payload, payload + "\n"].any? do |p|
+        payload_signature = Braintree::Digest.hexdigest(@config.private_key, p)
         Braintree::Digest.secure_compare(signature, payload_signature)
       end
-      raise InvalidSignature, 'signature does not match payload - one has been modified' unless signature_matches
+      raise InvalidSignature, "signature does not match payload - one has been modified" unless signature_matches
     end
   end
 end

data/lib/braintree/webhook_testing.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class WebhookTesting # :nodoc:
+  class WebhookTesting
     def self.sample_notification(*args)
       Configuration.gateway.webhook_testing.sample_notification(*args)
     end