braintree 2.98.0 → 4.23.0

data/lib/braintree/customer.rb

@@ -4,10 +4,7 @@ module Braintree
     include Braintree::Util::IdEquality
 
     attr_reader :addresses
-    attr_reader :amex_express_checkout_cards
-    attr_reader :android_pay_cards
     attr_reader :apple_pay_cards
-    attr_reader :coinbase_accounts
     attr_reader :company
     attr_reader :created_at
     attr_reader :credit_cards
@@ -15,12 +12,16 @@ module Braintree
     attr_reader :email
     attr_reader :fax
     attr_reader :first_name
+    attr_reader :google_pay_cards
+    attr_reader :graphql_id
     attr_reader :id
+    attr_reader :international_phone
     attr_reader :last_name
-    attr_reader :masterpass_cards
     attr_reader :paypal_accounts
     attr_reader :phone
     attr_reader :samsung_pay_cards
+    attr_reader :sepa_direct_debit_accounts
+    attr_reader :tax_identifiers
     attr_reader :updated_at
     attr_reader :us_bank_accounts
     attr_reader :venmo_accounts
@@ -39,24 +40,12 @@ module Braintree
       Configuration.gateway.customer.create!(*args)
     end
 
-    # Deprecated. Use Braintree::TransparentRedirect.url
-    def self.create_customer_url
-      warn "[DEPRECATED] Customer.create_customer_url is deprecated. Please use TransparentRedirect.url"
-      Configuration.gateway.customer.create_customer_url
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.confirm
-    def self.create_from_transparent_redirect(*args)
-      warn "[DEPRECATED] Customer.create_from_transparent_redirect is deprecated. Please use TransparentRedirect.confirm"
-      Configuration.gateway.customer.create_from_transparent_redirect(*args)
-    end
-
     def self.credit(customer_id, transaction_attributes)
       Transaction.credit(transaction_attributes.merge(:customer_id => customer_id))
     end
 
     def self.credit!(customer_id, transaction_attributes)
-       return_object_or_raise(:transaction){ credit(customer_id, transaction_attributes) }
+       return_object_or_raise(:transaction) { credit(customer_id, transaction_attributes) }
     end
 
     def self.delete(*args)
@@ -79,7 +68,6 @@ module Braintree
       Configuration.gateway.customer.search(&block)
     end
 
-    # Returns a ResourceCollection of transactions for the customer with the given +customer_id+.
     def self.transactions(*args)
       Configuration.gateway.customer.transactions(*args)
     end
@@ -92,34 +80,21 @@ module Braintree
       Configuration.gateway.customer.update!(*args)
     end
 
-    # Deprecated. Use Braintree::TransparentRedirect.url
-    def self.update_customer_url
-      warn "[DEPRECATED] Customer.update_customer_url is deprecated. Please use TransparentRedirect.url"
-      Configuration.gateway.customer.update_customer_url
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.confirm
-    def self.update_from_transparent_redirect(*args)
-      warn "[DEPRECATED] Customer.update_from_transparent_redirect is deprecated. Please use TransparentRedirect.confirm"
-      Configuration.gateway.customer.update_from_transparent_redirect(*args)
-    end
-
-    def initialize(gateway, attributes) # :nodoc:
+    # NEXT_MAJOR_VERSION remove samsung_pay_cards
+    def initialize(gateway, attributes)
       @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 }
-      @coinbase_accounts = (@coinbase_accounts || []).map { |pm| CoinbaseAccount._new gateway, pm }
       @apple_pay_cards = (@apple_pay_cards || []).map { |pm| ApplePayCard._new gateway, pm }
-      @europe_bank_accounts = (@europe_bank_Accounts || []).map { |pm| EuropeBankAccount._new gateway, pm }
-      @android_pay_cards = (@android_pay_cards || []).map { |pm| AndroidPayCard._new gateway, pm }
-      @amex_express_checkout_cards = (@amex_express_checkout_cards || []).map { |pm| AmexExpressCheckoutCard._new gateway, pm }
+      @google_pay_cards = (@google_pay_cards || []).map { |pm| GooglePayCard._new gateway, pm }
       @venmo_accounts = (@venmo_accounts || []).map { |pm| VenmoAccount._new gateway, pm }
       @us_bank_accounts = (@us_bank_accounts || []).map { |pm| UsBankAccount._new gateway, pm }
       @visa_checkout_cards = (@visa_checkout_cards|| []).map { |pm| VisaCheckoutCard._new gateway, pm }
-      @masterpass_cards = (@masterpass_cards|| []).map { |pm| MasterpassCard._new gateway, pm }
-      @samsung_pay_cards = (@samsung_pay_cards|| []).map { |pm| SamsungPayCard._new gateway, pm }
+      @sepa_direct_debit_accounts = (@sepa_debit_accounts || []).map { |pm| SepaDirectDebitAccount._new gateway, pm }
+      @samsung_pay_cards = (@samsung_pay_cards|| []).map { |pm| SamsungPayCard._new gateway, pm } # Deprecated
       @addresses = (@addresses || []).map { |addr| Address._new gateway, addr }
+      @tax_identifiers = (@tax_identifiers || []).map { |addr| TaxIdentifier._new gateway, addr }
       @custom_fields = attributes[:custom_fields].is_a?(Hash) ? attributes[:custom_fields] : {}
     end
 
@@ -131,15 +106,6 @@ module Braintree
       return_object_or_raise(:transaction) { credit(transaction_attributes) }
     end
 
-    # Deprecated. Use Braintree::Customer.default_payment_method
-    #
-    # Returns the customer's default credit card.
-    def default_credit_card
-      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
@@ -148,23 +114,21 @@ module Braintree
       @gateway.customer.delete(id)
     end
 
-    # Returns the customer's payment methods
     def payment_methods
       @credit_cards +
         @paypal_accounts +
         @apple_pay_cards +
-        @coinbase_accounts +
-        @android_pay_cards +
-        @amex_express_checkout_cards +
+        @google_pay_cards +
         @venmo_accounts +
         @us_bank_accounts +
         @visa_checkout_cards +
-        @samsung_pay_cards
+        @samsung_pay_cards +
+        @sepa_direct_debit_accounts
     end
 
-    def inspect # :nodoc:
+    def inspect
       first = [:id]
-      last = [:addresses, :credit_cards, :paypal_accounts]
+      last = [:addresses, :credit_cards, :paypal_accounts, :tax_identifiers]
       order = first + (self.class._attributes - first - last) + last
       nice_attributes = order.map do |attr|
         "#{attr}: #{send(attr).inspect}"
@@ -172,55 +136,26 @@ module Braintree
       "#<#{self.class} #{nice_attributes.join(', ')}>"
     end
 
-    # Deprecated. Use Braintree::Customer.sale
-    def sale(transaction_attributes)
-      warn "[DEPRECATED] sale as an instance method is deprecated. Please use Customer.sale"
-      @gateway.transaction.sale(transaction_attributes.merge(:customer_id => id))
-    end
-
-    # Deprecated. Use Braintree::Customer.sale!
-    def sale!(transaction_attributes)
-      warn "[DEPRECATED] sale! as an instance method is deprecated. Please use Customer.sale!"
-      return_object_or_raise(:transaction) { sale(transaction_attributes) }
-    end
-
-    # Returns a ResourceCollection of transactions for the customer.
     def transactions(options = {})
       @gateway.customer.transactions(id, options)
     end
 
-    # Deprecated. Use Braintree::Customer.update
-    def update(attributes)
-      warn "[DEPRECATED] update as an instance method is deprecated. Please use Customer.update"
-      result = @gateway.customer.update(id, attributes)
-      if result.success?
-        copy_instance_variables_from_object result.customer
-      end
-      result
-    end
-
-    # Deprecated. Use Braintree::Customer.update!
-    def update!(attributes)
-      warn "[DEPRECATED] update! as an instance method is deprecated. Please use Customer.update!"
-      return_object_or_raise(:customer) { update(attributes) }
-    end
-
     class << self
       protected :new
     end
 
-    def self._new(*args) # :nodoc:
-      self.new *args
+    def self._new(*args)
+      self.new(*args)
     end
 
-    def self._attributes # :nodoc:
+    def self._attributes
       [
-        :addresses, :company, :credit_cards, :email, :fax, :first_name, :id, :last_name, :phone, :website,
-        :created_at, :updated_at
+        :addresses, :company, :credit_cards, :email, :fax, :first_name, :id, :international_phone,
+        :last_name, :phone, :website, :created_at, :updated_at, :tax_identifiers
       ]
     end
 
-    def self._now_timestamp # :nodoc:
+    def self._now_timestamp
       Time.now.to_i
     end
   end

data/lib/braintree/customer_gateway.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class CustomerGateway # :nodoc:
+  class CustomerGateway
     include BaseModule
 
     def initialize(gateway)
@@ -22,17 +22,6 @@ module Braintree
       return_object_or_raise(:customer) { create(*args) }
     end
 
-    # Deprecated
-    def create_customer_url
-      "#{@config.base_merchant_url}/customers/all/create_via_transparent_redirect_request"
-    end
-
-    # Deprecated
-    def create_from_transparent_redirect(query_string)
-      params = @gateway.transparent_redirect.parse_and_validate_query_string query_string
-      _do_create("/customers/all/confirm_transparent_redirect_request", :id => params[:id])
-    end
-
     def delete(customer_id)
       @config.http.delete("#{@config.base_merchant_path}/customers/#{customer_id}")
       SuccessfulResult.new
@@ -71,20 +60,10 @@ module Braintree
       return_object_or_raise(:customer) { update(*args) }
     end
 
-    # Deprecated
-    def update_customer_url
-      warn "[DEPRECATED] Customer.update_customer_url is deprecated. Please use TransparentRedirect.url"
-      "#{@config.base_merchant_url}/customers/all/update_via_transparent_redirect_request"
-    end
-
-    # Deprecated
-    def update_from_transparent_redirect(query_string)
-      params = @gateway.transparent_redirect.parse_and_validate_query_string(query_string)
-      _do_update(:post, "/customers/all/confirm_transparent_redirect_request", :id => params[:id])
-    end
-
-    def self._create_signature # :nodoc:
+    def self._create_signature
       credit_card_signature = CreditCardGateway._create_signature - [:customer_id]
+      credit_card_options = credit_card_signature.find { |item| item.respond_to?(:keys) && item.keys == [:options] }
+      credit_card_options[:options].delete_if { |option| option == :fail_on_duplicate_payment_method_for_customer }
       paypal_account_signature = PayPalAccountGateway._create_nested_signature
       paypal_options_shipping_signature = AddressGateway._shared_signature
       options = [
@@ -98,17 +77,20 @@ module Braintree
         ],
       ]
       [
-        :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,
+        :company, :email, :fax, :first_name, :id,
+        {:international_phone => [:country_code, :national_number]},
+        :last_name, :phone, :website,
         :device_data, :payment_method_nonce,
         {:risk_data => [:customer_browser, :customer_ip]},
         {:credit_card => credit_card_signature},
         {:paypal_account => paypal_account_signature},
+        {:tax_identifiers => [:country_code, :identifier]},
         {:options => options},
         {:custom_fields => :_any_key_}
       ]
     end
 
-    def _do_create(path, params=nil) # :nodoc:
+    def _do_create(path, params=nil)
       response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
       if response[:customer]
         SuccessfulResult.new(:customer => Customer._new(@gateway, response[:customer]))
@@ -119,7 +101,7 @@ module Braintree
       end
     end
 
-    def _do_update(http_verb, path, params) # :nodoc:
+    def _do_update(http_verb, path, params)
       response = @config.http.send(http_verb, "#{@config.base_merchant_path}#{path}", params)
       if response[:customer]
         SuccessfulResult.new(:customer => Customer._new(@gateway, response[:customer]))
@@ -130,14 +112,14 @@ module Braintree
       end
     end
 
-    def _fetch_customers(search, ids) # :nodoc:
+    def _fetch_customers(search, ids)
       search.ids.in ids
       response = @config.http.post("#{@config.base_merchant_path}/customers/advanced_search", {:search => search.to_hash})
       attributes = response[:customers]
       Util.extract_attribute_as_array(attributes, :customer).map { |attrs| Customer._new(@gateway, attrs) }
     end
 
-    def _fetch_transactions(customer_id, ids) # :nodoc:
+    def _fetch_transactions(customer_id, ids)
       response = @config.http.post("#{@config.base_merchant_path}/customers/#{customer_id}/transactions", :search => {:ids => ids})
       attributes = response[:credit_card_transactions]
       Util.extract_attribute_as_array(attributes, :transaction).map do |transaction_attributes|
@@ -145,7 +127,7 @@ module Braintree
       end
     end
 
-    def self._update_signature # :nodoc:
+    def self._update_signature
       credit_card_signature = CreditCardGateway._update_signature - [:customer_id]
       credit_card_options = credit_card_signature.find { |item| item.respond_to?(:keys) && item.keys == [:options] }
       credit_card_options[:options] << :update_existing_token
@@ -161,9 +143,12 @@ module Braintree
         ],
       ]
       [
-        :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,
+        :company, :email, :fax, :first_name, :id,
+        {:international_phone => [:country_code, :national_number]},
+        :last_name, :phone, :website,
         :device_data, :payment_method_nonce, :default_payment_method_token,
         {:credit_card => credit_card_signature},
+        {:tax_identifiers => [:country_code, :identifier]},
         {:options => options},
         {:custom_fields => :_any_key_}
       ]

data/lib/braintree/customer_search.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class CustomerSearch < AdvancedSearch # :nodoc:
+  class CustomerSearch < AdvancedSearch
     text_fields(
       :address_country_name,
       :address_extended_address,
@@ -19,7 +19,7 @@ module Braintree
       :payment_method_token,
       :paypal_account_email,
       :phone,
-      :website
+      :website,
     )
 
     is_fields :payment_method_token_with_duplicates

data/lib/braintree/descriptor.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class Descriptor # :nodoc:
+  class Descriptor
     include BaseModule
 
     attr_reader :name

data/lib/braintree/digest.rb

@@ -1,5 +1,5 @@
 module Braintree
-  module Digest # :nodoc:
+  module Digest
     def self.hexdigest(private_key, string)
       _hmac_sha1(private_key, string)
     end

data/lib/braintree/disbursement.rb

@@ -20,7 +20,7 @@ module Braintree
 
     alias_method :success?, :success
 
-    def initialize(gateway, attributes) # :nodoc:
+    def initialize(gateway, attributes)
       @gateway = gateway
       set_instance_variables_from_hash(attributes)
       @amount = Util.to_big_decimal(amount)
@@ -29,15 +29,15 @@ module Braintree
     end
 
     def transactions
-      transactions = @gateway.transaction.search do |search|
+      @gateway.transaction.search do |search|
         search.ids.in transaction_ids
       end
     end
 
-    def inspect # :nodoc:
+    def inspect
       nice_attributes = self.class._inspect_attributes.map { |attr| "#{attr}: #{send(attr).inspect}" }
       nice_attributes << "amount: #{self.amount.to_s("F").inspect}"
-      nice_attributes << "disbursement_date: #{self.disbursement_date.to_s}"
+      nice_attributes << "disbursement_date: #{self.disbursement_date}"
       "#<#{self.class} #{nice_attributes.join(', ')}>"
     end
 
@@ -51,12 +51,12 @@ module Braintree
 
     class << self
       protected :new
-      def _new(*args) # :nodoc:
-        self.new *args
+      def _new(*args)
+        self.new(*args)
       end
     end
 
-    def self._inspect_attributes # :nodoc:
+    def self._inspect_attributes
       [:id, :exception_message, :follow_up_action, :merchant_account, :transaction_ids, :retry, :success]
     end
   end

data/lib/braintree/discount_gateway.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class DiscountGateway # :nodoc
+  class DiscountGateway
     def initialize(gateway)
       @gateway = gateway
       @config = gateway.config

data/lib/braintree/dispute/evidence.rb

@@ -1,6 +1,6 @@
 module Braintree
   class Dispute
-    class Evidence # :nodoc:
+    class Evidence
       include BaseModule
 
       attr_reader :category,

data/lib/braintree/{transaction/coinbase_details.rb → dispute/paypal_message.rb}

@@ -1,12 +1,11 @@
 module Braintree
-  class Transaction
-    class CoinbaseDetails
+  class Dispute
+    class PayPalMessage
       include BaseModule
 
-      attr_reader :user_id
-      attr_reader :user_email
-      attr_reader :user_name
-      attr_reader :token
+      attr_reader :message,
+        :sender,
+        :sent_at
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?

data/lib/braintree/dispute/{history_event.rb → status_history.rb}

@@ -1,6 +1,6 @@
 module Braintree
   class Dispute
-    class HistoryEvent # :nodoc:
+    class StatusHistory
       include BaseModule
 
       attr_reader :disbursement_date
@@ -10,6 +10,8 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @disbursement_date = Date.parse(disbursement_date) unless disbursement_date.nil?
+        @effective_date = Date.parse(effective_date) unless effective_date.nil?
       end
     end
   end

data/lib/braintree/dispute/transaction.rb

@@ -1,10 +1,12 @@
 module Braintree
   class Dispute
-    class Transaction # :nodoc:
+    class Transaction
       include BaseModule
 
       attr_reader :amount
+      attr_reader :created_at
       attr_reader :id
+      attr_reader :installment_count
       attr_reader :order_id
       attr_reader :purchase_order_number
       attr_reader :payment_instrument_subtype

data/lib/braintree/dispute/transaction_details.rb

@@ -1,6 +1,6 @@
 module Braintree
   class Dispute
-    class TransactionDetails # :nodoc:
+    class TransactionDetails
       include BaseModule
 
       attr_reader :amount

data/lib/braintree/dispute.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class Dispute # :nodoc:
+  class Dispute
     include BaseModule
     include Braintree::Util::IdEquality
 
@@ -7,16 +7,23 @@ module Braintree
     attr_reader :amount_disputed
     attr_reader :amount_won
     attr_reader :case_number
+    # NEXT_MAJOR_VERSION Remove this attribute
+    # DEPRECATED The chargeback_protection_level attribute is deprecated in favor of protection_level
+    attr_reader :chargeback_protection_level #Deprecated
     attr_reader :created_at
     attr_reader :currency_iso_code
     attr_reader :date_opened
     attr_reader :date_won
     attr_reader :evidence
-    attr_reader :forwarded_comments
+    attr_reader :graphql_id
     attr_reader :id
     attr_reader :kind
     attr_reader :merchant_account_id
     attr_reader :original_dispute_id
+    attr_reader :paypal_messages
+    attr_reader :pre_dispute_program
+    attr_reader :processor_comments
+    attr_reader :protection_level
     attr_reader :reason
     attr_reader :reason_code
     attr_reader :reason_description
@@ -31,10 +38,12 @@ module Braintree
 
     module Status
       Accepted = "accepted"
+      AutoAccepted = "auto_accepted"
       Disputed = "disputed"
       Expired = "expired"
       Open = "open"
       Lost = "lost"
+      UnderReview = "under_review"
       Won = "won"
 
       All = constants.map { |c| const_get(c) }
@@ -64,10 +73,33 @@ module Braintree
       All = constants.map { |c| const_get(c) }
     end
 
+    module ChargebackProtectionLevel
+      Effortless = "effortless"
+      Standard = "standard"
+      NotProtected = "not_protected"
+
+      All = constants.map { |c| const_get(c) }
+    end
+
+    module ProtectionLevel
+      EffortlessCBP = "Effortless Chargeback Protection tool"
+      StandardCBP = "Chargeback Protection tool"
+      NoProtection = "No Protection"
+
+      All = constants.map { |c| const_get(c) }
+    end
+
+    module PreDisputeProgram
+      None = "none"
+      VisaRdr = "visa_rdr"
+
+      All = constants.map { |c| const_get(c) }
+    end
+
     class << self
       protected :new
-      def _new(*args) # :nodoc:
-        self.new *args
+      def _new(*args)
+        self.new(*args)
       end
     end
 
@@ -99,7 +131,7 @@ module Braintree
       Configuration.gateway.dispute.search(&block)
     end
 
-    def initialize(attributes) # :nodoc:
+    def initialize(attributes)
       set_instance_variables_from_hash(attributes)
       @date_opened = Date.parse(date_opened) unless date_opened.nil?
       @date_won = Date.parse(date_won) unless date_won.nil?
@@ -108,16 +140,25 @@ module Braintree
       @amount = Util.to_big_decimal(amount)
       @amount_disputed = Util.to_big_decimal(amount_disputed)
       @amount_won = Util.to_big_decimal(amount_won)
+      if (ChargebackProtectionLevel::All - [ChargebackProtectionLevel::NotProtected]).include?(chargeback_protection_level)
+        @protection_level = Dispute.const_get("ProtectionLevel::#{chargeback_protection_level.capitalize}CBP")
+      else
+        @protection_level = ProtectionLevel::NoProtection
+      end
 
       @evidence = evidence.map do |record|
         Braintree::Dispute::Evidence.new(record)
       end unless evidence.nil?
 
+      @paypal_messages = paypal_messages.map do |record|
+        Braintree::Dispute::PayPalMessage.new(record)
+      end unless paypal_messages.nil?
+
       @transaction_details = TransactionDetails.new(transaction)
       @transaction = Transaction.new(transaction)
 
       @status_history = status_history.map do |event|
-        Braintree::Dispute::HistoryEvent.new(event)
+        Braintree::Dispute::StatusHistory.new(event)
       end unless status_history.nil?
     end
   end

data/lib/braintree/dispute_gateway.rb

@@ -1,5 +1,5 @@
 module Braintree
-  class DisputeGateway # :nodoc:
+  class DisputeGateway
     def initialize(gateway)
       @gateway = gateway
       @config = gateway.config
@@ -25,7 +25,7 @@ module Braintree
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
       raise ArgumentError, "document_id_or_request cannot be blank" if document_id_or_request.nil?
 
-      request = document_id_or_request.is_a?(Hash) ? document_id_or_request : { document_id: document_id_or_request }
+      request = document_id_or_request.is_a?(Hash) ? document_id_or_request : {document_id: document_id_or_request}
 
       raise ArgumentError, "document_id contains invalid characters" unless request[:document_id].to_s =~ /\A[\w-]+\z/
       raise ArgumentError, "document_id cannot be blank" if request[:document_id].nil? || dispute_id.to_s.strip == ""
@@ -55,23 +55,18 @@ module Braintree
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
       raise ArgumentError, "content_or_request cannot be blank" if content_or_request.nil?
 
-      request = content_or_request.is_a?(String) ? { content: content_or_request } : content_or_request
+      request = content_or_request.is_a?(String) ? {content: content_or_request} : content_or_request
 
       raise ArgumentError, "content cannot be blank" if request[:content].nil? || request[:content].to_s.strip == ""
-      raise ArgumentError, "request can only contain the keys [:content, :category, :sequence_number]" if (request.keys - [:category, :content, :tag, :sequence_number]).any?
+      raise ArgumentError, "request can only contain the keys [:content, :category, :sequence_number]" if (request.keys - [:category, :content, :sequence_number]).any?
       raise ArgumentError, "sequence_number must be an integer" if request[:sequence_number] && request[:sequence_number].to_s.match(/\D/)
-      raise ArgumentError, "tag must be a string" if request[:tag] && !request[:tag].is_a?(String)
       raise ArgumentError, "category must be a string" if request[:category] && !request[:category].is_a?(String)
 
-      warn "[DEPRECATED] tag as an option is deprecated. Please use category" if request[:tag]
-
-      category = request[:category] || request[:tag]
-
       params_for_http_post = {
         evidence: {
           comments: request[:content]
         }.tap do |evidence_params|
-          evidence_params[:category] = category if category
+          evidence_params[:category] = request[:category] if request[:category]
           evidence_params[:sequence_number] = request[:sequence_number] if request[:sequence_number]
         end
       }

data/lib/braintree/dispute_search.rb

@@ -1,15 +1,19 @@
 module Braintree
-  class DisputeSearch < AdvancedSearch # :nodoc:
+  class DisputeSearch < AdvancedSearch
     text_fields(
       :case_number,
       :customer_id,
       :id,
       :reference_number,
-      :transaction_id
+      :transaction_id,
     )
-
+    # NEXT_MAJOR_VERSION Remove this attribute
+    # DEPRECATED The chargeback_protection_level attribute is deprecated in favor of protection_level
+    multiple_value_field :chargeback_protection_level, :allows => Dispute::ChargebackProtectionLevel::All
+    multiple_value_field :protection_level, :allows => Dispute::ProtectionLevel::All
     multiple_value_field :kind, :allows => Dispute::Kind::All
     multiple_value_field :merchant_account_id
+    multiple_value_field :pre_dispute_program, :allows => Dispute::PreDisputeProgram::All
     multiple_value_field :reason, :allows => Dispute::Reason::All
     multiple_value_field :reason_code
     multiple_value_field :status, :allows => Dispute::Status::All
@@ -21,7 +25,7 @@ module Braintree
       :disbursement_date,
       :effective_date,
       :received_date,
-      :reply_by_date
+      :reply_by_date,
     )
   end
 end