activemerchant 1.85.0 → 1.86.0

data/lib/active_merchant/billing/gateways/itransact.rb

@@ -445,4 +445,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/jetpay.rb

@@ -395,7 +395,7 @@ module ActiveMerchant #:nodoc:
 
       def lookup_country_code(code)
         country = Country.find(code) rescue nil
-        country && country.code(:alpha3)
+        country&.code(:alpha3)
       end
     end
   end

data/lib/active_merchant/billing/gateways/jetpay_v2.rb

@@ -430,7 +430,7 @@ module ActiveMerchant #:nodoc:
 
       def lookup_country_code(code)
         country = Country.find(code) rescue nil
-        country && country.code(:alpha3)
+        country&.code(:alpha3)
       end
     end
   end

data/lib/active_merchant/billing/gateways/linkpoint.rb

@@ -340,7 +340,7 @@ module ActiveMerchant #:nodoc:
             :terminaltype => options[:terminaltype],
             :ip => options[:ip],
             :reference_number => options[:reference_number],
-            :recurring => options[:recurring] || 'NO',  #DO NOT USE if you are using the periodic billing option.
+            :recurring => options[:recurring] || 'NO',  # DO NOT USE if you are using the periodic billing option.
             :tdate => options[:tdate]
           },
           :orderoptions => {
@@ -434,9 +434,9 @@ module ActiveMerchant #:nodoc:
         response = {:message => 'Global Error Receipt', :complete => false}
 
         xml = REXML::Document.new("<response>#{xml}</response>")
-        xml.root.elements.each do |node|
+        xml.root&.elements&.each do |node|
           response[node.name.downcase.sub(/^r_/, '').to_sym] = normalize(node.text)
-        end unless xml.root.nil?
+        end
 
         response
       end

data/lib/active_merchant/billing/gateways/litle.rb

@@ -284,7 +284,7 @@ module ActiveMerchant #:nodoc:
             doc.cardholderAuthentication do
               doc.authenticationValue(payment_method.payment_cryptogram)
             end
-          elsif options[:order_source] && options[:order_source].start_with?('3ds')
+          elsif options[:order_source]&.start_with?('3ds')
             doc.cardholderAuthentication do
               doc.authenticationValue(options[:cavv]) if options[:cavv]
               doc.authenticationTransactionId(options[:xid]) if options[:xid]

data/lib/active_merchant/billing/gateways/mercado_pago.rb

@@ -186,6 +186,12 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         JSON.parse(body)
+      rescue JSON::ParserError
+        {
+          'status' => 'error',
+          'status_detail' => 'json_parse_error',
+          'message' => "A non-JSON response was received from Mercado Pago where one was expected. The raw response was:\n\n#{body}"
+        }
       end
 
       def commit(action, path, parameters)
@@ -207,7 +213,7 @@ module ActiveMerchant #:nodoc:
 
       def success_from(action, response)
         if action == 'refund'
-          response['error'].nil?
+          response['status'] != 404 && response['error'].nil?
         else
           ['active', 'approved', 'authorized', 'cancelled', 'in_process'].include?(response['status'])
         end

data/lib/active_merchant/billing/gateways/merchant_one.rb

@@ -111,4 +111,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/mercury.rb

@@ -212,7 +212,7 @@ module ActiveMerchant #:nodoc:
             # Track 1 and 2 have identical end sentinels (ETX) of '?'
             # Tracks may or may not have checksum (LRC) after the ETX
             # If the track has no STX or is corrupt, we send it as track 1, to let Mercury
-            #handle with the validation error as it sees fit.
+            # handle with the validation error as it sees fit.
             # Track 2 requires having the STX and ETX stripped. Track 1 does not.
             # Max-length track 1s require having the STX and ETX stripped. Max is 79 bytes including LRC.
             is_track_2 = credit_card.track_data[0] == ';'

data/lib/active_merchant/billing/gateways/migs.rb

@@ -314,11 +314,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def calculate_secure_hash(post, secure_hash)
-        input = post
-                .reject { |k| %i[SecureHash SecureHashType].include?(k) }
-                .sort
-                .map { |(k, v)| "vpc_#{k}=#{v}" }
-                .join('&')
+        input = post.
+                reject { |k| %i[SecureHash SecureHashType].include?(k) }.
+                sort.
+                map { |(k, v)| "vpc_#{k}=#{v}" }.
+                join('&')
         OpenSSL::HMAC.hexdigest('SHA256', [secure_hash].pack('H*'), input).upcase
       end
     end

data/lib/active_merchant/billing/gateways/modern_payments.rb

@@ -35,4 +35,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/modern_payments_cim.rb

@@ -215,4 +215,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/money_movers.rb

@@ -149,4 +149,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/mundipagg.rb

@@ -89,10 +89,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]')
-          .gsub(%r(("cvv\\":\\")\d*), '\1[FILTERED]')
-          .gsub(%r((card\\":{\\"number\\":\\")\d*), '\1[FILTERED]')
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r(("cvv\\":\\")\d*), '\1[FILTERED]').
+          gsub(%r((card\\":{\\"number\\":\\")\d*), '\1[FILTERED]')
       end
 
       private

data/lib/active_merchant/billing/gateways/nab_transact.rb

@@ -23,14 +23,14 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.default_currency = 'AUD'
 
-      #Transactions currently accepted by NAB Transact XML API
+      # Transactions currently accepted by NAB Transact XML API
       TRANSACTIONS = {
-        :purchase => 0,           #Standard Payment
-        :refund => 4,             #Refund
-        :void => 6,               #Client Reversal (Void)
-        :unmatched_refund => 666, #Unmatched Refund
-        :authorization => 10,     #Preauthorise
-        :capture => 11            #Preauthorise Complete (Advice)
+        :purchase => 0,           # Standard Payment
+        :refund => 4,             # Refund
+        :void => 6,               # Client Reversal (Void)
+        :unmatched_refund => 666, # Unmatched Refund
+        :authorization => 10,     # Preauthorise
+        :capture => 11            # Preauthorise Complete (Advice)
       }
 
       PERIODIC_TYPES = {
@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      #Generate payment request XML
+      # Generate payment request XML
       # - API is set to allow multiple Txn's but currently only allows one
       # - txnSource = 23 - (XML)
       def build_request(action, body)

data/lib/active_merchant/billing/gateways/net_registry.rb

@@ -131,7 +131,7 @@ module ActiveMerchant
       # format for a command.
       def expiry(credit_card)
         month = format(credit_card.month, :two_digits)
-        year  = format(credit_card.year , :two_digits)
+        year  = format(credit_card.year,  :two_digits)
         "#{month}/#{year}"
       end
 

data/lib/active_merchant/billing/gateways/netaxept.rb

@@ -178,4 +178,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/netbanx.rb

@@ -165,9 +165,10 @@ module ActiveMerchant #:nodoc:
         return {} if address.nil?
         country = Country.find(address[:country]) if address[:country]
         mapped = {
-          :street  => address[:address1],
-          :city    => address[:city],
-          :zip     => address[:zip],
+          :street => address[:address1],
+          :city   => address[:city],
+          :zip    => address[:zip],
+          :state  => address[:state],
         }
         mapped.merge!({:country => country.code(:alpha2).value}) unless country.blank?
 

data/lib/active_merchant/billing/gateways/netpay.rb

@@ -110,7 +110,6 @@ module ActiveMerchant #:nodoc:
         add_order_id(post, order_id_from(authorization))
         add_amount(post, money, options)
 
-        #commit('Refund', post, options)
         commit('Credit', post, options)
       end
 

data/lib/active_merchant/billing/gateways/network_merchants.rb

@@ -239,4 +239,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/omise.rb

@@ -19,7 +19,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'THB'
       self.money_format     = :cents
 
-      #Country supported by Omise
+      # Country supported by Omise
       # * Thailand
       self.supported_countries = %w( TH JP )
 

data/lib/active_merchant/billing/gateways/opp.rb

@@ -244,7 +244,6 @@ module ActiveMerchant #:nodoc:
 
       def add_payment_method(post, payment, options)
         if options[:registrationId]
-          #post[:recurringType] = 'REPEATED'
           post[:card] = {
             cvv: payment.verification_value,
           }

data/lib/active_merchant/billing/gateways/optimal_payment.rb

@@ -99,11 +99,11 @@ module ActiveMerchant #:nodoc:
           cc_stored_data_request(money, post)
         when 'ccAuthorizeReversal'
           cc_auth_reversal_request(post)
-        #when 'ccCancelSettle', 'ccCancelCredit', 'ccCancelPayment'
+        # when 'ccCancelSettle', 'ccCancelCredit', 'ccCancelPayment'
         #  cc_cancel_request(money, post)
-        #when 'ccPayment'
+        # when 'ccPayment'
         #  cc_payment_request(money, post)
-        #when 'ccAuthenticate'
+        # when 'ccAuthenticate'
         #  cc_authenticate_request(money, post)
         else
           raise 'Unknown Action'
@@ -178,7 +178,7 @@ module ActiveMerchant #:nodoc:
 
       def get_text_from_document(document, node)
         node = REXML::XPath.first(document, node)
-        node && node.text
+        node&.text
       end
 
       def cc_auth_request(money, opts)
@@ -255,27 +255,27 @@ module ActiveMerchant #:nodoc:
 
       def build_merchant_account(xml)
         xml.tag! 'merchantAccount' do
-          xml.tag! 'accountNum' , @options[:account_number]
-          xml.tag! 'storeID'    , @options[:store_id]
-          xml.tag! 'storePwd'   , @options[:password]
+          xml.tag! 'accountNum', @options[:account_number]
+          xml.tag! 'storeID',    @options[:store_id]
+          xml.tag! 'storePwd',   @options[:password]
         end
       end
 
       def build_card(xml, opts)
         xml.tag! 'card' do
-          xml.tag! 'cardNum'      , @credit_card.number
+          xml.tag! 'cardNum', @credit_card.number
           xml.tag! 'cardExpiry' do
-            xml.tag! 'month'      , @credit_card.month
-            xml.tag! 'year'       , @credit_card.year
+            xml.tag! 'month', @credit_card.month
+            xml.tag! 'year', @credit_card.year
           end
           if brand = card_type(@credit_card.brand)
-            xml.tag! 'cardType'     , brand
+            xml.tag! 'cardType', brand
           end
           if @credit_card.verification_value?
-            xml.tag! 'cvdIndicator' , '1' # Value Provided
-            xml.tag! 'cvd'          , @credit_card.verification_value
+            xml.tag! 'cvdIndicator', '1' # Value Provided
+            xml.tag! 'cvd', @credit_card.verification_value
           else
-            xml.tag! 'cvdIndicator' , '0'
+            xml.tag! 'cvdIndicator', '0'
           end
         end
       end
@@ -299,18 +299,18 @@ module ActiveMerchant #:nodoc:
         if addr[:name]
           first_name, last_name = split_names(addr[:name])
           xml.tag! 'firstName', first_name
-          xml.tag! 'lastName' , last_name
+          xml.tag! 'lastName', last_name
         end
-        xml.tag! 'street' , addr[:address1] if addr[:address1].present?
+        xml.tag! 'street', addr[:address1] if addr[:address1].present?
         xml.tag! 'street2', addr[:address2] if addr[:address2].present?
-        xml.tag! 'city'   , addr[:city]     if addr[:city].present?
+        xml.tag! 'city', addr[:city] if addr[:city].present?
         if addr[:state].present?
           state_tag = %w(US CA).include?(addr[:country]) ? 'state' : 'region'
           xml.tag! state_tag, addr[:state]
         end
-        xml.tag! 'country', addr[:country]  if addr[:country].present?
-        xml.tag! 'zip'    , addr[:zip]      if addr[:zip].present?
-        xml.tag! 'phone'  , addr[:phone]    if addr[:phone].present?
+        xml.tag! 'country', addr[:country] if addr[:country].present?
+        xml.tag! 'zip', addr[:zip] if addr[:zip].present?
+        xml.tag! 'phone', addr[:phone] if addr[:phone].present?
       end
 
       def card_type(key)

data/lib/active_merchant/billing/gateways/orbital.rb

@@ -396,7 +396,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! :AVSphoneNum, (address[:phone] ? address[:phone].scan(/\d/).join.to_s[0..13] : nil)
           end
 
-          xml.tag! :AVSname, ((creditcard && creditcard.name) ? creditcard.name[0..29] : nil)
+          xml.tag! :AVSname, (creditcard&.name ? creditcard.name[0..29] : nil)
           xml.tag! :AVScountryCode, (avs_supported ? byte_limit(format_address_field(address[:country]), 2) : '')
 
           # Needs to come after AVScountryCode

data/lib/active_merchant/billing/gateways/pac_net_raven.rb

@@ -204,4 +204,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/pagarme.rb

@@ -181,7 +181,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def json_error(raw_response)
-		  msg = 'Resposta inválida retornada pela API do Pagar.me. Por favor entre em contato com suporte@pagar.me se você continuar recebendo essa mensagem.'
+        msg = 'Resposta inválida retornada pela API do Pagar.me. Por favor entre em contato com suporte@pagar.me se você continuar recebendo essa mensagem.'
         msg += "  (A resposta retornada pela API foi #{raw_response.inspect})"
         {
           'errors' => [{

data/lib/active_merchant/billing/gateways/pay_gate_xml.rb

@@ -274,4 +274,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/gateways/pay_junction_v2.rb

@@ -173,7 +173,7 @@ module ActiveMerchant #:nodoc:
       def message_from(response)
         return response['response']['message'] if response['response']
 
-        response['errors'].inject(''){ |message,error| error['message'] + '|' + message } if response['errors']
+        response['errors']&.inject(''){ |message,error| error['message'] + '|' + message }
       end
 
       def authorization_from(response)

data/lib/active_merchant/billing/gateways/pay_secure.rb

@@ -109,4 +109,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/payeezy.rb

@@ -374,7 +374,7 @@ module ActiveMerchant
             response['transaction_id'],
             response['transaction_tag'],
             params[:method],
-            (response['amount'] && response['amount'].to_i)
+            response['amount']&.to_i
           ].join('|')
         end
       end

data/lib/active_merchant/billing/gateways/payex.rb

@@ -363,7 +363,7 @@ module ActiveMerchant #:nodoc:
 
         doc = Nokogiri::XML(body)
 
-        doc.root.xpath('*').each do |node|
+        doc.root&.xpath('*')&.each do |node|
           if (node.elements.size == 0)
             response[node.name.downcase.to_sym] = node.text
           else
@@ -372,7 +372,7 @@ module ActiveMerchant #:nodoc:
               response[name.to_sym] = childnode.text
             end
           end
-        end unless doc.root.nil?
+        end
 
         response
       end
@@ -408,4 +408,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb

@@ -22,6 +22,10 @@ module ActiveMerchant #:nodoc:
         address['country']
       end
 
+      def phone
+        @params['phone']
+      end
+
       def address
         {  'name'       => @params['shiptoname'] || full_name,
            'company'    => nil,
@@ -31,7 +35,7 @@ module ActiveMerchant #:nodoc:
            'state'      => @params['state'],
            'country'    => @params['country'],
            'zip'        => @params['zip'],
-           'phone'      => nil
+           'phone'      => phone,
         }
       end
     end

data/lib/active_merchant/billing/gateways/payflow/payflow_response.rb

@@ -4,10 +4,10 @@ module ActiveMerchant #:nodoc:
       def profile_id
         @params['profile_id']
       end
-      
+
       def payment_history
         @payment_history ||= @params['rp_payment_result'].collect(&:stringify_keys) rescue []
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/gateways/payflow_express_uk.rb

@@ -12,4 +12,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-