braintree 3.1.0 → 4.1.0

data/lib/braintree/transaction_gateway.rb

@@ -53,7 +53,7 @@ module Braintree
     end
 
     def credit(attributes)
-      create(attributes.merge(:type => 'credit'))
+      create(attributes.merge(:type => "credit"))
     end
 
     def credit!(*args)
@@ -72,7 +72,7 @@ module Braintree
       options = if amount_or_options.is_a?(Hash)
                   amount_or_options
                 else
-                  { :amount => amount_or_options }
+                  {:amount => amount_or_options}
                 end
 
       Util.verify_keys(TransactionGateway._refund_signature, options)
@@ -97,7 +97,7 @@ module Braintree
     end
 
     def sale(attributes)
-      create(attributes.merge(:type => 'sale'))
+      create(attributes.merge(:type => "sale"))
     end
 
     def sale!(*args)
@@ -139,6 +139,18 @@ module Braintree
       return_object_or_raise(:transaction) { submit_for_settlement(*args) }
     end
 
+    def adjust_authorization(transaction_id, amount)
+      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      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)
+      _handle_transaction_response(response)
+    end
+
+    def adjust_authorization!(*args)
+      return_object_or_raise(:transaction) { adjust_authorization(*args) }
+    end
+
     def update_details(transaction_id, options = {})
       raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
       Util.verify_keys(TransactionGateway._update_details_signature, options)
@@ -180,9 +192,10 @@ module Braintree
         :shared_shipping_address_id, :shipping_address_id, :shipping_amount,
         :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,
         :three_d_secure_token, :transaction_source, :type, :venmo_sdk_payment_method_code,
+        :sca_exemption, :currency_iso_code,
         {:line_items => [:quantity, :name, :description, :kind, :unit_amount, :unit_tax_amount, :total_amount, :discount_amount, :tax_amount, :unit_of_measure, :product_code, :commodity_code, :url]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
-        {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]},
+        {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number, {:payment_reader_card_details => [:encrypted_card_data, :key_serial_number]}]},
         {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
         {
           :billing => AddressGateway._shared_signature
@@ -245,7 +258,8 @@ module Braintree
           ]},
         ]},
         {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
-        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]}
+        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]},
+        {:installments => [:count]},
       ]
     end
 
@@ -263,6 +277,12 @@ module Braintree
       ]
     end
 
+    def self._adjust_authorization_signature
+      [
+        :amount
+      ]
+    end
+
     def self._update_details_signature # :nodoc:
       [
         :amount,
@@ -274,7 +294,8 @@ module Braintree
     def self._refund_signature
       [
         :amount,
-        :order_id
+        :merchant_account_id,
+        :order_id,
       ]
     end
 

data/lib/braintree/transaction_line_item.rb

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

data/lib/braintree/transaction_search.rb

@@ -37,7 +37,8 @@ module Braintree
       :shipping_locality,
       :shipping_postal_code,
       :shipping_region,
-      :shipping_street_address
+      :shipping_street_address,
+      :store_id,
     )
 
     equality_fields :credit_card_expiration_date
@@ -59,6 +60,7 @@ module Braintree
     multiple_value_field :status, :allows => Transaction::Status::All
     multiple_value_field :source
     multiple_value_field :type, :allows => Transaction::Type::All
+    multiple_value_field :store_ids
 
     key_value_fields :refund
 

data/lib/braintree/unknown_payment_method.rb

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

data/lib/braintree/us_bank_account.rb

@@ -35,7 +35,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
 
     def self.find(*args)
@@ -45,8 +45,8 @@ module Braintree
     def self.sale(token, transaction_attributes)
       Configuration.gateway.transaction.sale(transaction_attributes.merge(
           :payment_method_token => token,
-          :options => { :submit_for_settlement => true }
-        )
+          :options => {:submit_for_settlement => true},
+        ),
       )
     end
 

data/lib/braintree/us_bank_account_verification.rb

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

data/lib/braintree/us_bank_account_verification_gateway.rb

@@ -18,7 +18,7 @@ module Braintree
         ErrorResult.new(@gateway, response[:api_error_response])
       else
         SuccessfulResult.new(
-          :us_bank_account_verification => UsBankAccountVerification._new(response[:us_bank_account_verification])
+          :us_bank_account_verification => UsBankAccountVerification._new(response[:us_bank_account_verification]),
         )
       end
     rescue NotFoundError

data/lib/braintree/util.rb

@@ -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

data/lib/braintree/venmo_account.rb

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

data/lib/braintree/version.rb

@@ -1,6 +1,6 @@
 module Braintree
   module Version
-    Major = 3
+    Major = 4
     Minor = 1
     Tiny = 0
 

data/lib/braintree/visa_checkout_card.rb

@@ -39,7 +39,7 @@ module Braintree
     end
 
     def _most_recent_verification(attributes)
-      verification = (attributes[:verifications] || []).sort_by{ |verification| verification[:created_at] }.reverse.first
+      verification = (attributes[:verifications] || []).sort_by { |verification| verification[:created_at] }.reverse.first
       CreditCardVerification._new(verification) if verification
     end
 
@@ -84,7 +84,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/webhook_notification.rb

@@ -1,12 +1,17 @@
-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"
 
@@ -17,6 +22,24 @@ module Braintree
       DisputeDisputed = "dispute_disputed"
       DisputeExpired = "dispute_expired"
 
+      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
+
+      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
+      GrantedPaymentMethodRevoked = "granted_payment_method_revoked"
+
+      LocalPaymentCompleted = "local_payment_completed"
+      LocalPaymentReversed = "local_payment_reversed"
+
+      OAuthAccessRevoked = "oauth_access_revoked"
+
+      PartnerMerchantConnected = "partner_merchant_connected"
+      PartnerMerchantDisconnected = "partner_merchant_disconnected"
+      PartnerMerchantDeclined = "partner_merchant_declined"
+
+      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
+
+      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
+
       SubscriptionCanceled = "subscription_canceled"
       SubscriptionChargedSuccessfully = "subscription_charged_successfully"
       SubscriptionChargedUnsuccessfully = "subscription_charged_unsuccessfully"
@@ -27,25 +50,10 @@ module Braintree
 
       SubMerchantAccountApproved = "sub_merchant_account_approved"
       SubMerchantAccountDeclined = "sub_merchant_account_declined"
+
       TransactionDisbursed = "transaction_disbursed"
       TransactionSettlementDeclined = "transaction_settlement_declined"
       TransactionSettled = "transaction_settled"
-      PartnerMerchantConnected = "partner_merchant_connected"
-      PartnerMerchantDisconnected = "partner_merchant_disconnected"
-      PartnerMerchantDeclined = "partner_merchant_declined"
-
-      AccountUpdaterDailyReport = "account_updater_daily_report"
-
-      OAuthAccessRevoked = "oauth_access_revoked"
-      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
-      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
-
-      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
@@ -57,6 +65,7 @@ module Braintree
     attr_reader :revoked_payment_method_metadata
     attr_reader :kind
     attr_reader :local_payment_completed
+    attr_reader :local_payment_reversed
     attr_reader :oauth_access_revocation
     attr_reader :partner_merchant
     attr_reader :source_merchant_id
@@ -87,8 +96,9 @@ module Braintree
       @connected_merchant_status_transitioned = ConnectedMerchantStatusTransitioned._new(@subject[:connected_merchant_status_transitioned]) if @subject.has_key?(:connected_merchant_status_transitioned)
       @connected_merchant_paypal_status_changed = ConnectedMerchantPayPalStatusChanged._new(@subject[:connected_merchant_paypal_status_changed]) if @subject.has_key?(:connected_merchant_paypal_status_changed)
       @granted_payment_instrument_update = GrantedPaymentInstrumentUpdate._new(@subject[:granted_payment_instrument_update]) if @subject.has_key?(:granted_payment_instrument_update)
-      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::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_reversed = LocalPaymentReversed._new(@subject[:local_payment_reversed]) if @subject.has_key?(:local_payment_reversed) && Kind::LocalPaymentReversed == @kind
     end
 
     def merchant_account
@@ -110,7 +120,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/webhook_notification_gateway.rb

@@ -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
@@ -34,13 +34,13 @@ module Braintree
 
     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)
         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_gateway.rb

@@ -82,10 +82,14 @@ module Braintree
         _granted_payment_instrument_update_sample_xml(id)
       when Braintree::WebhookNotification::Kind::RecipientUpdatedGrantedPaymentMethod
         _granted_payment_instrument_update_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::GrantedPaymentMethodRevoked
+        _granted_payment_method_revoked_xml(id)
       when Braintree::WebhookNotification::Kind::PaymentMethodRevokedByCustomer
         _payment_method_revoked_by_customer_sample_xml(id)
       when Braintree::WebhookNotification::Kind::LocalPaymentCompleted
         _local_payment_completed_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::LocalPaymentReversed
+        _local_payment_reversed_sample_xml(id)
       else
         _subscription_sample_xml(id)
       end
@@ -875,6 +879,24 @@ module Braintree
       XML
     end
 
+    def _granted_payment_method_revoked_xml(id)
+      <<-XML
+        <venmo-account>
+          <created-at type='dateTime'>2018-10-11T21:28:37Z</created-at>
+          <updated-at type='dateTime'>2018-10-11T21:28:37Z</updated-at>
+          <default type='boolean'>true</default>
+          <image-url>https://assets.braintreegateway.com/payment_method_logo/venmo.png?environment=test</image-url>
+          <token>#{id}</token>
+          <source-description>Venmo Account: venmojoe</source-description>
+          <username>venmojoe</username>
+          <venmo-user-id>456</venmo-user-id>
+          <subscriptions type='array'/>
+          <customer-id>venmo_customer_id</customer-id>
+          <global-id>cGF5bWVudG1ldGhvZF92ZW5tb2FjY291bnQ</global-id>
+        </venmo-account>
+      XML
+    end
+
     def _payment_method_revoked_by_customer_sample_xml(id)
       <<-XML
         <paypal-account>
@@ -912,5 +934,13 @@ module Braintree
         </local-payment>
       XML
     end
+
+    def _local_payment_reversed_sample_xml(id)
+      <<-XML
+        <local-payment-reversed>
+          <payment-id>PAY-XYZ123</payment-id>
+        </local-payment-reversed>
+      XML
+    end
   end
 end

data/lib/braintree/xml/generator.rb

@@ -12,6 +12,7 @@ module Braintree
         "Date"       => "datetime",
         "DateTime"   => "datetime",
         "Time"       => "datetime",
+        "ActiveSupport::TimeWithZone" => "datetime"
       }
 
       XML_FORMATTING_NAMES = {
@@ -25,7 +26,7 @@ module Braintree
           date_or_time.respond_to?(:xmlschema) ? date_or_time.xmlschema : date_or_time.to_s
         end,
         "bigdecimal" => Proc.new do |bigdecimal|
-          str = bigdecimal.to_s('F')
+          str = bigdecimal.to_s("F")
           if str =~ /\.\d$/
             str += "0"
           end
@@ -61,15 +62,15 @@ module Braintree
             else
               type_name = XML_TYPE_NAMES[value.class.name]
 
-              attributes = ((value.nil? || type_name.nil?) ? {} : { :type => type_name })
+              attributes = ((value.nil? || type_name.nil?) ? {} : {:type => type_name})
               if value.nil?
                 attributes[:nil] = true
               end
 
-							formatting_name = XML_FORMATTING_NAMES[value.class.name]
+              formatting_name = XML_FORMATTING_NAMES[value.class.name]
               options[:builder].tag!(_xml_escape(key),
                 XML_FORMATTING[formatting_name] ? XML_FORMATTING[formatting_name].call(value) : value,
-                attributes
+                attributes,
               )
             end
           end