braintree 4.39.0 → 4.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a8a4986148f9b2ded5832261519f85d75e2932d7d7d15bc7d49207d2422431e
-  data.tar.gz: 3431f5d87f5f15ffd7c2d29fe28674d7c49645f0447342360d0f41444def6c16
+  metadata.gz: 874cd322dda721874dc4418b2f6ca24116b9395f7affc02d43fe056f43424b3a
+  data.tar.gz: 8c73ed2ec27ecf6b916474bc12dc14bde985c48107a53bdcea17a65a216cc3d5
 SHA512:
-  metadata.gz: d523c2199f88f2eea71960c92659b7e8aabb02aa78c35ab51f0b513b575d408b6df9b881c5d895ed8a30b300c3ab4c43fa48ce3d88a331dcd9c96c9c6aac8ca8
-  data.tar.gz: d6dc3e11eec83fcbd5c045ff92b04e83ff80686ecc19eedf17a50b19b68d0511f2ec1514fa0f13081ba889509ae161f8f1121380a6e51baa1daf66fa6115f509
+  metadata.gz: f8f4fa7af94d5b317dc5efa9aea66d1fbcf84f689e9cb19435f6899b8af8c39fb25063a8d0ff40e4025f42014e4c18555e9d4b2e779132b0fc73afc3f6204baa
+  data.tar.gz: 815d5927abfa22e7acbdf7fa4353d9408b0b0add7f66a5e1cbf43b2b2aaa03a5ac4f925eb25b69bcf1060ff04c01e9cdc9c908e560a4e6e7df9db14339ed886a

data/lib/braintree/address_gateway.rb

@@ -13,7 +13,7 @@ module Braintree
       unless attributes[:customer_id]
         raise ArgumentError, "Expected hash to contain a :customer_id"
       end
-      unless attributes[:customer_id] =~ /\A[0-9A-Za-z_-]+\z/
+      if Util.invalid_path_segment?(attributes[:customer_id])
         raise ArgumentError, ":customer_id contains invalid characters"
       end
       response = @config.http.post("#{@config.base_merchant_path}/customers/#{attributes.delete(:customer_id)}/addresses", :address => attributes)
@@ -32,13 +32,14 @@ module Braintree
 
     def delete(customer_or_customer_id, address_id)
       customer_id = _determine_customer_id(customer_or_customer_id)
+      address_id = _determine_address_id(address_id)
       @config.http.delete("#{@config.base_merchant_path}/customers/#{customer_id}/addresses/#{address_id}")
       SuccessfulResult.new
     end
 
     def find(customer_or_customer_id, address_id)
       customer_id = _determine_customer_id(customer_or_customer_id)
-      raise ArgumentError if address_id.nil? || address_id.to_s.strip == ""
+      address_id = _determine_address_id(address_id)
       response = @config.http.get("#{@config.base_merchant_path}/customers/#{customer_id}/addresses/#{address_id}")
       Address._new(@gateway, response[:address])
     rescue NotFoundError
@@ -48,6 +49,7 @@ module Braintree
     def update(customer_or_customer_id, address_id, attributes)
       Util.verify_keys(AddressGateway._update_signature, attributes)
       customer_id = _determine_customer_id(customer_or_customer_id)
+      address_id = _determine_address_id(address_id)
       response = @config.http.put("#{@config.base_merchant_path}/customers/#{customer_id}/addresses/#{address_id}", :address => attributes)
       if response[:address]
         SuccessfulResult.new(:address => Address._new(@gateway, response[:address]))
@@ -64,12 +66,20 @@ module Braintree
 
     def _determine_customer_id(customer_or_customer_id)
       customer_id = customer_or_customer_id.is_a?(Customer) ? customer_or_customer_id.id : customer_or_customer_id
-      unless customer_id =~ /\A[\w_-]+\z/
+      if Util.invalid_path_segment?(customer_id)
         raise ArgumentError, "customer_id contains invalid characters"
       end
       customer_id
     end
 
+    def _determine_address_id(address_id)
+      address_id = address_id.to_s
+      if Util.invalid_path_segment?(address_id)
+        raise ArgumentError, "address_id contains invalid characters"
+      end
+      address_id
+    end
+
     def self._create_signature
       _shared_signature + [:customer_id]
     end

data/lib/braintree/client_token_gateway.rb

@@ -9,12 +9,21 @@ module Braintree
     end
 
     def generate(options={})
+      options = options.dup
+
       _validate_options(options)
 
       options[:version] ||= ClientToken::DEFAULT_VERSION
 
       Util.verify_keys(ClientTokenGateway._generate_signature, options)
 
+      if options.has_key?(:preferred_payment_method_token)
+        options[:payment_method_id] = options.delete(:preferred_payment_method_token)
+        options.delete("preferred_payment_method_token")
+      elsif options.has_key?("preferred_payment_method_token")
+        options[:payment_method_id] = options.delete("preferred_payment_method_token")
+      end
+
       params = {:client_token => options}
       result = @config.http.post("#{@config.base_merchant_path}/client_token", params)
 
@@ -27,7 +36,7 @@ module Braintree
 
     def self._generate_signature
       [
-        :address_id, :customer_id, :proxy_merchant_id, :merchant_account_id,
+        :address_id, :customer_id, :merchant_account_id, :preferred_payment_method_token, :proxy_merchant_id,
         :version,
         {:domains => [:_any_key_]},
         {:options => [:fail_on_duplicate_payment_method, :fail_on_duplicate_payment_method_for_customer, :make_default, :verify_card]}

data/lib/braintree/credit_card_gateway.rb

@@ -39,6 +39,8 @@ module Braintree
     end
 
     def delete(token)
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       @config.http.delete("#{@config.base_merchant_path}/payment_methods/credit_card/#{token}")
     end
 
@@ -55,7 +57,8 @@ module Braintree
     end
 
     def find(token)
-      raise ArgumentError if token.nil? || token.to_s.strip == ""
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       response = @config.http.get("#{@config.base_merchant_path}/payment_methods/credit_card/#{token}")
       CreditCard._new(@gateway, response[:credit_card])
     rescue NotFoundError
@@ -63,7 +66,8 @@ module Braintree
     end
 
     def from_nonce(nonce)
-      raise ArgumentError if nonce.nil? || nonce.to_s.strip == ""
+      raise ArgumentError, "nonce contains invalid characters" if Util.invalid_path_segment?(nonce)
+
       response = @config.http.get("#{@config.base_merchant_path}/payment_methods/from_nonce/#{nonce}")
       CreditCard._new(@gateway, response[:credit_card])
     rescue NotFoundError
@@ -71,6 +75,8 @@ module Braintree
     end
 
     def update(token, attributes)
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       # NEXT_MAJOR_VERSION remove this check
       if attributes.has_key?(:venmo_sdk_payment_method_code) || attributes.has_key?(:venmo_sdk_session)
         warn "[DEPRECATED] The Venmo SDK integration is Unsupported. Please update your integration to use Pay with Venmo instead."
@@ -129,6 +135,7 @@ module Braintree
           :directory_response,
           :cavv_algorithm,
           :ds_transaction_id,
+          :network,
         ]
       }
 

data/lib/braintree/credit_card_verification_gateway.rb

@@ -8,6 +8,8 @@ module Braintree
 
     def find(id)
       raise ArgumentError if id.nil? || id.to_s.strip == ""
+      raise ArgumentError, "id contains invalid characters" if Util.invalid_path_segment?(id)
+
       response = @config.http.get("#{@config.base_merchant_path}/verifications/#{id}")
       CreditCardVerification._new(response[:verification])
     rescue NotFoundError
@@ -81,6 +83,7 @@ module Braintree
           :directory_response,
           :ds_transaction_id,
           :eci_flag,
+          :network,
           :three_d_secure_version,
           :xid,
         ]},

data/lib/braintree/customer_gateway.rb

@@ -23,15 +23,19 @@ module Braintree
     end
 
     def delete(customer_id)
+      raise ArgumentError, "customer_id contains invalid characters" if Util.invalid_path_segment?(customer_id)
+
       @config.http.delete("#{@config.base_merchant_path}/customers/#{customer_id}")
       SuccessfulResult.new
     end
 
     def find(customer_id, options = {})
-      raise ArgumentError, "customer_id contains invalid characters" unless customer_id.to_s =~ /\A[\w-]+\z/
-      raise ArgumentError, "customer_id cannot be blank" if customer_id.nil?|| customer_id.to_s.strip == ""
+      raise ArgumentError, "customer_id contains invalid characters" if Util.invalid_path_segment?(customer_id)
+
+      association_filter_id = options[:association_filter_id]
+      raise ArgumentError, "association_filter_id contains invalid characters" if association_filter_id && Util.invalid_path_segment?(association_filter_id)
 
-      query_params = options[:association_filter_id].nil? ? "" : "?association_filter_id=#{options[:association_filter_id]}"
+      query_params = association_filter_id.nil? ? "" : "?association_filter_id=#{association_filter_id}"
       response = @config.http.get("#{@config.base_merchant_path}/customers/#{customer_id}#{query_params}")
       Customer._new(@gateway, response[:customer])
     rescue NotFoundError
@@ -47,11 +51,15 @@ module Braintree
     end
 
     def transactions(customer_id, options = {})
+      raise ArgumentError, "customer_id contains invalid characters" if Util.invalid_path_segment?(customer_id)
+
       response = @config.http.post("#{@config.base_merchant_path}/customers/#{customer_id}/transaction_ids")
       ResourceCollection.new(response) { |ids| _fetch_transactions(customer_id, ids) }
     end
 
     def update(customer_id, attributes)
+      raise ArgumentError, "customer_id contains invalid characters" if Util.invalid_path_segment?(customer_id)
+
       Util.verify_keys(CustomerGateway._update_signature, attributes)
       _do_update(:put, "/customers/#{customer_id}", :customer => attributes)
     end

data/lib/braintree/dispute_gateway.rb

@@ -7,7 +7,7 @@ module Braintree
     end
 
     def accept(dispute_id)
-      raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "dispute_id contains invalid characters" if Util.invalid_path_segment?(dispute_id)
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
 
       response = @config.http.put("#{@config.base_merchant_path}/disputes/#{dispute_id}/accept")
@@ -21,7 +21,7 @@ module Braintree
     end
 
     def add_file_evidence(dispute_id, document_id_or_request)
-      raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "dispute_id contains invalid characters" if Util.invalid_path_segment?(dispute_id)
       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?
 
@@ -51,7 +51,7 @@ module Braintree
     end
 
     def add_text_evidence(dispute_id, content_or_request)
-      raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "dispute_id contains invalid characters" if Util.invalid_path_segment?(dispute_id)
       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?
 
@@ -84,7 +84,7 @@ module Braintree
     end
 
     def finalize(dispute_id)
-      raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "dispute_id contains invalid characters" if Util.invalid_path_segment?(dispute_id)
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
 
       response = @config.http.put("#{@config.base_merchant_path}/disputes/#{dispute_id}/finalize")
@@ -98,7 +98,7 @@ module Braintree
     end
 
     def find(dispute_id)
-      raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "dispute_id contains invalid characters" if Util.invalid_path_segment?(dispute_id)
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
       response = @config.http.get("#{@config.base_merchant_path}/disputes/#{dispute_id}")
       Dispute._new(response[:dispute])
@@ -107,9 +107,9 @@ module Braintree
     end
 
     def remove_evidence(dispute_id, evidence_id)
-      raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "dispute_id contains invalid characters" if Util.invalid_path_segment?(dispute_id)
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
-      raise ArgumentError, "evidence_id contains invalid characters" unless evidence_id.to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "evidence_id contains invalid characters" if Util.invalid_path_segment?(evidence_id)
       raise ArgumentError, "evidence_id cannot be blank" if evidence_id.nil? || evidence_id.to_s.strip == ""
 
       response = @config.http.delete("#{@config.base_merchant_path}/disputes/#{dispute_id}/evidence/#{evidence_id}")

data/lib/braintree/error_codes.rb

@@ -216,6 +216,8 @@ module Braintree
       CannotVaultOneTimeUsePayPalAccount = "82902"
       ConsentCodeOrAccessTokenIsRequired = "82901"
       CustomerIdIsRequiredForVaulting = "82905"
+      EmailFormatIsInvalid = "92963"
+      EmailIsTooLong = "92964"
       IncompletePayPalAccount = "82901"
       InvalidFundingSourceSelection = "92913"
       InvalidParamsForPayPalAccountUpdate = "92915"
@@ -472,6 +474,10 @@ module Braintree
       ThreeDSecureEciFlagIsInvalid = "915114"
       ThreeDSecureEciFlagIsRequired = "915113"
       ThreeDSecureMerchantAccountDoesNotSupportCardType = "915131"
+      ThreeDSecureNetworkDoesNotMatchPaymentInstrument = "915139"
+      ThreeDSecureNetworkDoesNotSupportCurrency = "915239"
+      ThreeDSecureNetworkDoesNotSupportMerchantAccountCurrency = "915243"
+      ThreeDSecureNetworkIsInvalid = "915128"
       ThreeDSecureThreeDSecureVersionIsInvalid = "915119"
       ThreeDSecureTokenIsInvalid = "91568"
       ThreeDSecureTransactionDataDoesntMatchVerify = "91570"
@@ -502,6 +508,7 @@ module Braintree
 
 
       module Options
+        SubmitForSettlementIsNotSupportedForNetwork = "915261"
         SubmitForSettlementIsRequiredForCloning = "91544"
         SubmitForSettlementIsRequiredForPayPalUnilateral = "91582"
         VaultIsDisabled = "91525"
@@ -768,6 +775,10 @@ module Braintree
         DirectoryResponseIsInvalid = "942121"
         EciFlagIsInvalid = "942114"
         EciFlagIsRequired = "942113"
+        NetworkDoesNotMatchPaymentInstrument = "942139"
+        NetworkDoesNotSupportCurrency = "942129"
+        NetworkDoesNotSupportMerchantAccountCurrency = "942130"
+        NetworkIsInvalid = "942128"
         ThreeDSecureVersionIsInvalid = "942119"
         ThreeDSecureVersionIsRequired = "942117"
       end

data/lib/braintree/http.rb

@@ -8,7 +8,8 @@ module Braintree
     end
 
     def delete(path, query_params = {})
-      response = _http_do Net::HTTP::Delete, path
+      full_path = path + _build_query_string(query_params)
+      response = _http_do Net::HTTP::Delete, full_path
       if response.code.to_i == 200 || response.code.to_i == 204
         true
       elsif response.code.to_i == 422
@@ -19,7 +20,8 @@ module Braintree
     end
 
     def get(path, query_params = {})
-      response = _http_do Net::HTTP::Get, path
+      full_path = path + _build_query_string(query_params)
+      response = _http_do Net::HTTP::Get, full_path
       if response.code.to_i == 200 || response.code.to_i == 422
         Xml.hash_from_xml(_body(response))
       else

data/lib/braintree/merchant_account_gateway.rb

@@ -22,6 +22,8 @@ module Braintree
 
     def find(merchant_account_id)
       raise ArgumentError if merchant_account_id.nil? || merchant_account_id.to_s.strip == ""
+      raise ArgumentError, "merchant_account_id contains invalid characters" if Util.invalid_path_segment?(merchant_account_id)
+
       response = @config.http.get("#{@config.base_merchant_path}/merchant_accounts/#{merchant_account_id}")
       MerchantAccount._new(@gateway, response[:merchant_account])
     rescue NotFoundError

data/lib/braintree/payment_method_gateway.rb

@@ -33,6 +33,8 @@ module Braintree
     end
 
     def delete(token, options = {})
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       Util.verify_keys(PaymentMethodGateway._delete_signature, options)
       query_param = "?" + Util.hash_to_query_string(options) if not options.empty?
       @config.http.delete("#{@config.base_merchant_path}/payment_methods/any/#{token}#{query_param}")
@@ -40,7 +42,8 @@ module Braintree
     end
 
     def find(token)
-      raise ArgumentError if token.nil? || token.to_s.strip == ""
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       response = @config.http.get("#{@config.base_merchant_path}/payment_methods/any/#{token}")
       if response.has_key?(:credit_card)
         CreditCard._new(@gateway, response[:credit_card])
@@ -64,6 +67,8 @@ module Braintree
     end
 
     def update(token, attributes)
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       # NEXT_MAJOR_VERSION remove this check
       if attributes.has_key?(:venmo_sdk_payment_method_code) || attributes.has_key?(:venmo_sdk_session)
         warn "[DEPRECATED] The Venmo SDK integration is Unsupported. Please update your integration to use Pay with Venmo instead."
@@ -199,6 +204,7 @@ module Braintree
           :directory_response,
           :cavv_algorithm,
           :ds_transaction_id,
+          :network,
         ]
       }
       signature << {

data/lib/braintree/payment_method_nonce_gateway.rb

@@ -9,6 +9,8 @@ module Braintree
     end
 
     def create(payment_method_token, args = {payment_method_nonce: {}})
+      raise ArgumentError, "payment_method_token contains invalid characters" if Util.invalid_path_segment?(payment_method_token)
+
       Util.verify_keys(PaymentMethodNonceGateway._create_signature, args)
 
       response = @config.http.post("#{@config.base_merchant_path}/payment_methods/#{payment_method_token}/nonces", args)
@@ -30,6 +32,8 @@ module Braintree
     end
 
     def find(payment_method_nonce)
+      raise ArgumentError, "payment_method_nonce contains invalid characters" if Util.invalid_path_segment?(payment_method_nonce)
+
       response = @config.http.get("#{@config.base_merchant_path}/payment_method_nonces/#{payment_method_nonce}")
       payment_method_nonce = PaymentMethodNonce._new(@gateway, response.fetch(:payment_method_nonce))
       SuccessfulResult.new(:payment_method_nonce => payment_method_nonce)

data/lib/braintree/paypal_account_gateway.rb

@@ -7,7 +7,8 @@ module Braintree
     end
 
     def find(token)
-      raise ArgumentError if token.nil? || token.to_s.strip == ""
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       response = @config.http.get("#{@config.base_merchant_path}/payment_methods/paypal_account/#{token}")
       PayPalAccount._new(@gateway, response[:paypal_account])
     rescue NotFoundError
@@ -20,11 +21,15 @@ module Braintree
     end
 
     def update(token, attributes)
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       Util.verify_keys(PayPalAccountGateway._update_signature, attributes)
       _do_update(:put, "/payment_methods/paypal_account/#{token}", :paypal_account => attributes)
     end
 
     def delete(token)
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       @config.http.delete("#{@config.base_merchant_path}/payment_methods/paypal_account/#{token}")
     end
 

data/lib/braintree/plan_gateway.rb

@@ -27,6 +27,8 @@ module Braintree
 
     def find(id)
       raise ArgumentError if id.nil? || id.to_s.strip == ""
+      raise ArgumentError, "id contains invalid characters" if Util.invalid_path_segment?(id)
+
       response = @config.http.get("#{@config.base_merchant_path}/plans/#{id}")
       Plan._new(@gateway, response[:plan])
     rescue NotFoundError
@@ -34,6 +36,8 @@ module Braintree
     end
 
     def update(plan_id, attributes)
+      raise ArgumentError, "plan_id contains invalid characters" if Util.invalid_path_segment?(plan_id)
+
       Util.verify_keys(PlanGateway._update_signature, attributes)
       response = @config.http.put("#{@config.base_merchant_path}/plans/#{plan_id}", :plan => attributes)
       if response[:plan]

data/lib/braintree/sepa_direct_debit_account_gateway.rb

@@ -8,6 +8,8 @@ module Braintree
 
     def find(token)
       raise ArgumentError if token.nil? || token.to_s.strip == ""
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       response = @config.http.get("#{@config.base_merchant_path}/payment_methods/sepa_debit_account/#{token}")
       SepaDirectDebitAccount._new(@gateway, response[:sepa_debit_account])
     rescue NotFoundError
@@ -16,6 +18,8 @@ module Braintree
 
     def delete(token)
       raise ArgumentError if token.nil? || token.to_s.strip == ""
+      raise ArgumentError, "token contains invalid characters" if Util.invalid_path_segment?(token)
+
       @config.http.delete("#{@config.base_merchant_path}/payment_methods/sepa_debit_account/#{token}")
       SuccessfulResult.new
     rescue NotFoundError

data/lib/braintree/subscription_gateway.rb

@@ -9,6 +9,8 @@ module Braintree
     end
 
     def cancel(subscription_id)
+      raise ArgumentError, "subscription_id contains invalid characters" if Util.invalid_path_segment?(subscription_id)
+
       response = @config.http.put("#{@config.base_merchant_path}/subscriptions/#{subscription_id}/cancel")
       if response[:subscription]
         SuccessfulResult.new(:subscription => Subscription._new(@gateway, response[:subscription]))
@@ -36,6 +38,8 @@ module Braintree
 
     def find(id)
       raise ArgumentError if id.nil? || id.to_s.strip == ""
+      raise ArgumentError, "id contains invalid characters" if Util.invalid_path_segment?(id)
+
       response = @config.http.get("#{@config.base_merchant_path}/subscriptions/#{id}")
       Subscription._new(@gateway, response[:subscription])
     rescue NotFoundError
@@ -55,6 +59,8 @@ module Braintree
     end
 
     def update(subscription_id, attributes)
+      raise ArgumentError, "subscription_id contains invalid characters" if Util.invalid_path_segment?(subscription_id)
+
       Util.verify_keys(SubscriptionGateway._update_signature, attributes)
       response = @config.http.put("#{@config.base_merchant_path}/subscriptions/#{subscription_id}", :subscription => attributes)
       if response[:subscription]

data/lib/braintree/testing_gateway.rb

@@ -10,6 +10,7 @@ module Braintree
 
     def settle(transaction_id)
       check_environment
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
 
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/settle")
       @transaction_gateway._handle_transaction_response(response)
@@ -17,6 +18,7 @@ module Braintree
 
     def settlement_confirm(transaction_id)
       check_environment
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
 
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/settlement_confirm")
       @transaction_gateway._handle_transaction_response(response)
@@ -24,6 +26,7 @@ module Braintree
 
     def settlement_decline(transaction_id)
       check_environment
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
 
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/settlement_decline")
       @transaction_gateway._handle_transaction_response(response)
@@ -31,6 +34,7 @@ module Braintree
 
     def settlement_pending(transaction_id)
       check_environment
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
 
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/settlement_pending")
       @transaction_gateway._handle_transaction_response(response)

data/lib/braintree/three_d_secure_pass_thru.rb

@@ -0,0 +1,11 @@
+module Braintree
+  module ThreeDSecurePassThru
+    module Network
+      Eftpos = "eftpos"
+      MasterCard = "Mastercard"
+      Visa = "Visa"
+
+      All = constants.map { |c| const_get(c) }
+    end
+  end
+end

data/lib/braintree/transaction.rb

@@ -3,6 +3,12 @@ module Braintree
     include BaseModule
     include Braintree::Util::IdEquality
 
+    module AchType
+      SameDay  = "same_day"
+      Standard = "standard"
+      All = constants.map { |c| const_get(c) }
+    end
+
     module CreatedUsing
       FullInformation = "full_information"
       Token = "token"

data/lib/braintree/transaction_gateway.rb

@@ -22,7 +22,7 @@ module Braintree
     end
 
     def cancel_release(transaction_id)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/cancel_release")
       _handle_transaction_response(response)
     end
@@ -42,6 +42,8 @@ module Braintree
     end
 
     def clone_transaction(transaction_id, attributes)
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
+
       Util.verify_keys(TransactionGateway._clone_signature, attributes)
       _do_create "/transactions/#{transaction_id}/clone", :transaction_clone => attributes
     end
@@ -59,7 +61,9 @@ module Braintree
     end
 
     def find(id)
-      raise ArgumentError, "id can not be empty" if id.nil? || id.strip.to_s == ""
+      raise ArgumentError, "id can not be empty" if id.nil? || id.to_s.strip == ""
+      raise ArgumentError, "id contains invalid characters" if Util.invalid_path_segment?(id)
+
       response = @config.http.get("#{@config.base_merchant_path}/transactions/#{id}")
       Transaction._new(@gateway, response[:transaction])
     rescue NotFoundError
@@ -67,6 +71,8 @@ module Braintree
     end
 
     def refund(transaction_id, amount_or_options = nil)
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
+
       options = if amount_or_options.is_a?(Hash)
                   amount_or_options
                 else
@@ -103,7 +109,7 @@ module Braintree
     end
 
     def package_tracking(transaction_id, package_tracking_request)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
       Util.verify_keys(TransactionGateway._package_tracking_request_signature, package_tracking_request)
       _do_create "/transactions/#{transaction_id}/shipments", :shipment => package_tracking_request
     end
@@ -126,7 +132,7 @@ module Braintree
     end
 
     def submit_for_settlement(transaction_id, amount = nil, options = {})
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
       Util.verify_keys(TransactionGateway._submit_for_settlement_signature, options)
       transaction_params = {:amount => amount}.merge(options)
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/submit_for_settlement", :transaction => transaction_params)
@@ -138,7 +144,7 @@ module Braintree
     end
 
     def adjust_authorization(transaction_id, amount)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
       Util.verify_keys(TransactionGateway._adjust_authorization_signature, {})
       transaction_params = {:amount => amount}
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/adjust_authorization", :transaction => transaction_params)
@@ -150,14 +156,14 @@ module Braintree
     end
 
     def update_details(transaction_id, options = {})
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
       Util.verify_keys(TransactionGateway._update_details_signature, options)
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/update_details", :transaction => options)
       _handle_transaction_response(response)
     end
 
     def submit_for_partial_settlement(authorized_transaction_id, amount = nil, options = {})
-      raise ArgumentError, "authorized_transaction_id is invalid" unless authorized_transaction_id =~ /\A[0-9a-z]+\z/
+      raise ArgumentError, "authorized_transaction_id contains invalid characters" if Util.invalid_path_segment?(authorized_transaction_id)
       Util.verify_keys(TransactionGateway._submit_for_partial_settlement_signature, options)
       transaction_params = {:amount => amount}.merge(options)
       response = @config.http.post("#{@config.base_merchant_path}/transactions/#{authorized_transaction_id}/submit_for_partial_settlement", :transaction => transaction_params)
@@ -169,6 +175,8 @@ module Braintree
     end
 
     def void(transaction_id, options = {})
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
+
       transaction_params = options.empty? ? nil : options
       response = @config.http.put(
         "#{@config.base_merchant_path}/transactions/#{transaction_id}/void",
@@ -283,6 +291,7 @@ module Braintree
             :directory_response,
             :cavv_algorithm,
             :ds_transaction_id,
+            :network,
           ]
         },
         {
@@ -381,6 +390,7 @@ module Braintree
         :api_request_key,
         :merchant_account_id,
         :order_id,
+        :surcharge_amount,
       ]
     end
 

data/lib/braintree/transaction_line_item_gateway.rb

@@ -7,7 +7,9 @@ module Braintree
     end
 
     def find_all(transaction_id)
-      raise ArgumentError, "transaction_id cannot be blank" if transaction_id.nil? || transaction_id.strip.to_s == ""
+      raise ArgumentError, "transaction_id cannot be blank" if transaction_id.nil? || transaction_id.to_s.strip == ""
+      raise ArgumentError, "transaction_id contains invalid characters" if Util.invalid_path_segment?(transaction_id)
+
       response = @config.http.get("#{@config.base_merchant_path}/transactions/#{transaction_id}/line_items")
       response[:line_items].map do |line_item_params|
         TransactionLineItem._new(@gateway, line_item_params)