braintree 3.3.0 → 3.4.0

data/lib/braintree/http.rb

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

data/lib/braintree/local_payment_completed.rb

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

data/lib/braintree/local_payment_reversed.rb

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

data/lib/braintree/merchant.rb

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

data/lib/braintree/merchant_account.rb

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

data/lib/braintree/merchant_account_gateway.rb

@@ -74,7 +74,7 @@ module Braintree
 
       if response.has_key?(:response) && response[:response][:merchant_account]
         Braintree::SuccessfulResult.new(
-          :merchant_account => MerchantAccount._new(@gateway, response[:response][:merchant_account])
+          :merchant_account => MerchantAccount._new(@gateway, response[:response][:merchant_account]),
         )
       elsif response[:api_error_response]
         ErrorResult.new(@gateway, response[:api_error_response])

data/lib/braintree/merchant_gateway.rb

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

data/lib/braintree/modification.rb

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

data/lib/braintree/oauth_credentials.rb

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

data/lib/braintree/oauth_gateway.rb

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

data/lib/braintree/payment_instrument_type.rb

@@ -1,14 +1,14 @@
 module Braintree
   module PaymentInstrumentType
-    PayPalAccount = 'paypal_account'
-    CreditCard = 'credit_card'
-    ApplePayCard = 'apple_pay_card'
-    GooglePayCard = 'android_pay_card'
-    VenmoAccount = 'venmo_account'
-    UsBankAccount = 'us_bank_account'
-    VisaCheckoutCard = 'visa_checkout_card'
-    SamsungPayCard = 'samsung_pay_card'
-    LocalPayment = 'local_payment'
-    PayPalHere = 'paypal_here'
+    PayPalAccount = "paypal_account"
+    CreditCard = "credit_card"
+    ApplePayCard = "apple_pay_card"
+    GooglePayCard = "android_pay_card"
+    VenmoAccount = "venmo_account"
+    UsBankAccount = "us_bank_account"
+    VisaCheckoutCard = "visa_checkout_card"
+    SamsungPayCard = "samsung_pay_card"
+    LocalPayment = "local_payment"
+    PayPalHere = "paypal_here"
   end
 end

data/lib/braintree/payment_method_gateway.rb

@@ -82,7 +82,7 @@ module Braintree
       if  options.class == Hash
         grant_options = options
       elsif [true, false].include?(options)
-        grant_options = { :allow_vaulting => options }
+        grant_options = {:allow_vaulting => options}
       else
         raise ArgumentError
       end
@@ -91,7 +91,7 @@ module Braintree
         "/payment_methods/grant",
         :payment_method => {
           :shared_payment_method_token => token,
-        }.merge(grant_options)
+        }.merge(grant_options),
       )
     rescue NotFoundError
       raise NotFoundError, "payment method with token #{token.inspect} not found"
@@ -115,7 +115,7 @@ module Braintree
         "/payment_methods/revoke",
         :payment_method => {
           :shared_payment_method_token => token
-        }
+        },
       )
     rescue NotFoundError
       raise NotFoundError, "payment method with token #{token.inspect} not found"

data/lib/braintree/payment_method_nonce_gateway.rb

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

data/lib/braintree/plan.rb

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

data/lib/braintree/processor_response_types.rb

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

data/lib/braintree/revoked_payment_method_metadata.rb

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

data/lib/braintree/samsung_pay_card.rb

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

data/lib/braintree/settlement_batch_summary.rb

@@ -1,11 +1,11 @@
 module Braintree
   class SettlementBatchSummary
     include BaseModule
-    
+
     attr_reader :records
 
     def self.generate(settlement_date, group_by_custom_field = nil)
-      criteria = { :settlement_date => settlement_date }
+      criteria = {:settlement_date => settlement_date}
       criteria.merge!({:group_by_custom_field => group_by_custom_field}) if group_by_custom_field
       Configuration.gateway.settlement_batch_summary.generate(criteria)
     end

data/lib/braintree/subscription.rb

@@ -11,11 +11,11 @@ module Braintree
     end
 
     module Status
-      Active = 'Active'
-      Canceled = 'Canceled'
-      Expired = 'Expired'
-      PastDue = 'Past Due'
-      Pending = 'Pending'
+      Active = "Active"
+      Canceled = "Canceled"
+      Expired = "Expired"
+      PastDue = "Past Due"
+      Pending = "Pending"
 
       All = constants.map { |c| const_get(c) }
     end
@@ -115,7 +115,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/transaction.rb

@@ -4,18 +4,18 @@ module Braintree
     include Braintree::Util::IdEquality
 
     module CreatedUsing
-      FullInformation = 'full_information'
-      Token = 'token'
-      Unrecognized = 'unrecognized'
+      FullInformation = "full_information"
+      Token = "token"
+      Unrecognized = "unrecognized"
     end
 
     module EscrowStatus
-      HoldPending    = 'hold_pending'
-      Held           = 'held'
-      ReleasePending = 'release_pending'
-      Released       = 'released'
-      Refunded       = 'refunded'
-      Unrecognized   = 'unrecognized'
+      HoldPending    = "hold_pending"
+      Held           = "held"
+      ReleasePending = "release_pending"
+      Released       = "released"
+      Refunded       = "refunded"
+      Unrecognized   = "unrecognized"
     end
 
     module GatewayRejectionReason
@@ -32,20 +32,20 @@ module Braintree
     end
 
     module Status
-      AuthorizationExpired   = 'authorization_expired'
-      Authorizing            = 'authorizing'
-      Authorized             = 'authorized'
-      GatewayRejected        = 'gateway_rejected'
-      Failed                 = 'failed'
-      ProcessorDeclined      = 'processor_declined'
-      Settled                = 'settled'
-      SettlementConfirmed    = 'settlement_confirmed'
-      SettlementDeclined     = 'settlement_declined'
-      SettlementPending      = 'settlement_pending'
-      Settling               = 'settling'
-      SubmittedForSettlement = 'submitted_for_settlement'
-      Voided                 = 'voided'
-      Unrecognized           = 'unrecognized'
+      AuthorizationExpired   = "authorization_expired"
+      Authorizing            = "authorizing"
+      Authorized             = "authorized"
+      GatewayRejected        = "gateway_rejected"
+      Failed                 = "failed"
+      ProcessorDeclined      = "processor_declined"
+      Settled                = "settled"
+      SettlementConfirmed    = "settlement_confirmed"
+      SettlementDeclined     = "settlement_declined"
+      SettlementPending      = "settlement_pending"
+      Settling               = "settling"
+      SubmittedForSettlement = "submitted_for_settlement"
+      Voided                 = "voided"
+      Unrecognized           = "unrecognized"
 
       All = constants.map { |c| const_get(c) }
     end
@@ -169,6 +169,14 @@ module Braintree
     attr_reader :visa_checkout_card_details
     attr_reader :voice_referral_number
 
+    def self.adjust_authorization(*args)
+      Configuration.gateway.transaction.adjust_authorization(*args)
+    end
+
+    def self.adjust_authorization!(*args)
+      Configuration.gateway.transaction.adjust_authorization!(*args)
+    end
+
     def self.create(*args)
       Configuration.gateway.transaction.create(*args)
     end
@@ -386,7 +394,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
 

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)
@@ -265,6 +277,12 @@ module Braintree
       ]
     end
 
+    def self._adjust_authorization_signature
+      [
+        :amount
+      ]
+    end
+
     def self._update_details_signature # :nodoc:
       [
         :amount,
@@ -276,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