activemerchant 1.85.0 → 1.86.0

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

@@ -1,23 +1,22 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class CardSaveGateway < IridiumGateway
-      #CardSave lets you handle failovers on payments by providing 3 gateways in case one happens to be down
-      #URLS = ['https://gw1.cardsaveonlinepayments.com:4430/','https://gw2.cardsaveonlinepayments.com:4430/','https://gw3.cardsaveonlinepayments.com:4430/']      
-      
+      # CardSave lets you handle failovers on payments by providing 3 gateways in case one happens to be down
+      # URLS = ['https://gw1.cardsaveonlinepayments.com:4430/','https://gw2.cardsaveonlinepayments.com:4430/','https://gw3.cardsaveonlinepayments.com:4430/']
+
       self.money_format = :cents
       self.default_currency = 'GBP'
       self.supported_cardtypes = [ :visa, :maestro, :master, :american_express, :jcb ]
       self.supported_countries = [ 'GB' ]
       self.homepage_url = 'http://www.cardsave.net/'
       self.display_name = 'CardSave'
-      
+
       def initialize(options={})
         super
         @test_url = 'https://gw1.cardsaveonlinepayments.com:4430/'
         @live_url = 'https://gw1.cardsaveonlinepayments.com:4430/'
       end
-      
+
     end
   end
 end
-

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

@@ -99,10 +99,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r{(authentication\.[^=]+=)[^&]+}, '\1[FILTERED]')
-          .gsub(%r{(card\.number=)\d+}, '\1[FILTERED]')
-          .gsub(%r{(cvv=)\d{3,4}}, '\1[FILTERED]\2')
+        transcript.
+          gsub(%r{(authentication\.[^=]+=)[^&]+}, '\1[FILTERED]').
+          gsub(%r{(card\.number=)\d+}, '\1[FILTERED]').
+          gsub(%r{(cvv=)\d{3,4}}, '\1[FILTERED]\2')
       end
 
       private

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

@@ -60,10 +60,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r{(password=)[^&]+}, '\1[FILTERED]')
-          .gsub(%r{(cardno=)[^&]+}, '\1[FILTERED]')
-          .gsub(%r{(cid=)[^&]+}, '\1[FILTERED]')
+        transcript.
+          gsub(%r{(password=)[^&]+}, '\1[FILTERED]').
+          gsub(%r{(cardno=)[^&]+}, '\1[FILTERED]').
+          gsub(%r{(cid=)[^&]+}, '\1[FILTERED]')
       end
 
       private

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

@@ -19,7 +19,7 @@ module ActiveMerchant #:nodoc:
       CECA_UI_LESS_LANGUAGE = 'XML'
       CECA_UI_LESS_LANGUAGE_REFUND = '1'
       CECA_UI_LESS_REFUND_PAGE = 'anulacion_xml'
-      CECA_ACTION_REFUND   = 'tpvanularparcialmente' #use partial refund's URL to avoid time frame limitations and decision logic on client side
+      CECA_ACTION_REFUND   = 'tpvanularparcialmente' # use partial refund's URL to avoid time frame limitations and decision logic on client side
       CECA_ACTION_PURCHASE = 'tpv'
       CECA_CURRENCIES_DICTIONARY = {'EUR' => 978, 'USD' => 840, 'GBP' => 826}
 

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

@@ -125,13 +125,13 @@ module ActiveMerchant #:nodoc:
 
       def add_shipping_info(xml, options)
         if options[:shipping_address]
-          xml.ship_address_   options[:shipping_address][:address1]
-          xml.ship_address2_  options[:shipping_address][:address2]
-          xml.ship_city_    options[:shipping_address][:city]
-          xml.ship_state_   options[:shipping_address][:state]
-          xml.ship_postal_  options[:shipping_address][:zip]
-          xml.ship_country_   options[:shipping_address][:country]
-          xml.ship_phone_   options[:shipping_address][:phone]
+          xml.ship_address_  options[:shipping_address][:address1]
+          xml.ship_address2_ options[:shipping_address][:address2]
+          xml.ship_city_     options[:shipping_address][:city]
+          xml.ship_state_    options[:shipping_address][:state]
+          xml.ship_postal_   options[:shipping_address][:zip]
+          xml.ship_country_  options[:shipping_address][:country]
+          xml.ship_phone_    options[:shipping_address][:phone]
         end
       end
 
@@ -144,7 +144,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_other_fields(xml, options)
-        xml.bill_email_   options[:email]
+        xml.bill_email_ options[:email]
         xml.bill_customerip_ options[:ip]
         xml.merchantcustomerid_ options[:customer]
         xml.descriptor_name options[:descriptor_name]

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

@@ -20,4 +20,3 @@ module ActiveMerchant
     end
   end
 end
-

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

@@ -14,14 +14,14 @@ module ActiveMerchant #:nodoc:
 
       self.homepage_url = 'https://www.creditcall.com'
       self.display_name = 'Creditcall'
-      
+
       CVV_CODE = {
         'matched' => 'M',
         'notmatched' => 'N',
         'notchecked' => 'P',
         'partialmatch' => 'N'
       }
-      
+
       AVS_CODE = {
         'matched;matched' => 'D',
         'matched;notchecked' =>'B',
@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
         end
 
         merged_params = multi_response.responses.map(&:params).reduce({}, :merge)
-        
+
         Response.new(
           multi_response.primary_response.success?,
           multi_response.primary_response.message,

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

@@ -185,7 +185,7 @@ module ActiveMerchant #:nodoc:
         add_email(post, options)
         add_echo(post, options)
         add_transaction_type(post, options)
-        
+
         commit(:credit, post)
       end
 

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

@@ -242,7 +242,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        response['errorDescription'] || (response['terminalDisp'].strip if response['terminalDisp'])
+        response['errorDescription'] || response['terminalDisp']&.strip
       end
 
       def authorization_from(response)

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

@@ -48,7 +48,7 @@ module ActiveMerchant #:nodoc:
 
       @@response_codes = {
         :r100 => 'Successful transaction',
-        :r101 => 'Request is missing one or more required fields' ,
+        :r101 => 'Request is missing one or more required fields',
         :r102 => 'One or more fields contains invalid data',
         :r150 => 'General failure',
         :r151 => 'The request was received but a server time-out occurred',
@@ -432,9 +432,9 @@ module ActiveMerchant #:nodoc:
       def add_merchant_data(xml, options)
         xml.tag! 'merchantID', @options[:login]
         xml.tag! 'merchantReferenceCode', options[:order_id] || generate_unique_id
-        xml.tag! 'clientLibrary' ,'Ruby Active Merchant'
+        xml.tag! 'clientLibrary','Ruby Active Merchant'
         xml.tag! 'clientLibraryVersion',  VERSION
-        xml.tag! 'clientEnvironment' , RUBY_PLATFORM
+        xml.tag! 'clientEnvironment', RUBY_PLATFORM
       end
 
       def add_purchase_data(xml, money = 0, include_grand_total = false, options={})
@@ -663,7 +663,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_validate_pinless_debit_service(xml)
-        xml.tag!'pinlessDebitValidateService', {'run' => 'true'}
+        xml.tag! 'pinlessDebitValidateService', {'run' => 'true'}
       end
 
       def add_threeds_services(xml, options)
@@ -677,7 +677,7 @@ module ActiveMerchant #:nodoc:
 
       def lookup_country_code(country_field)
         country_code = Country.find(country_field) rescue nil
-        country_code.code(:alpha2) if country_code
+        country_code&.code(:alpha2)
       end
 
       # Where we actually build the full SOAP request using builder

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

@@ -200,15 +200,15 @@ module ActiveMerchant #:nodoc:
       CREDIT_CARD_FIELDS =  %w(AuthorizationNumber ClientIpAddress BillingAddress BillingCity BillingState BillingPostalCode BillingCountry BillingName CardVerificationValue ExpirationMonth ExpirationYear ReferenceNumber TransactionAmount AccountNumber )
 
       ACTIONS = {
-           :credit_card_authorize		=> CREDIT_CARD_FIELDS,
-           :credit_card_charge			=> CREDIT_CARD_FIELDS,
-           :credit_card_voice_authorize		=> CREDIT_CARD_FIELDS,
-           :credit_card_capture			=> CREDIT_CARD_FIELDS,
-           :credit_card_credit			=> CREDIT_CARD_FIELDS + ['OriginalTransactionAmount'],
-           :credit_card_refund			=> %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
-           :void_transaction			=> %w(ReferenceNumber TransactionID),
-           :credit_card_settle			=> %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
-           :system_check			=> %w(SystemCheck),
+           :credit_card_authorize       => CREDIT_CARD_FIELDS,
+           :credit_card_charge          => CREDIT_CARD_FIELDS,
+           :credit_card_voice_authorize => CREDIT_CARD_FIELDS,
+           :credit_card_capture         => CREDIT_CARD_FIELDS,
+           :credit_card_credit          => CREDIT_CARD_FIELDS + ['OriginalTransactionAmount'],
+           :credit_card_refund          => %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
+           :void_transaction            => %w(ReferenceNumber TransactionID),
+           :credit_card_settle          => %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
+           :system_check                => %w(SystemCheck),
       }
     end
   end

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

@@ -191,10 +191,8 @@ module ActiveMerchant #:nodoc:
         form[:email] = truncate(options[:email], 100) unless empty?(options[:email])
         form[:customer_code] = truncate(options[:customer], 10) unless empty?(options[:customer])
         form[:customer_number] = options[:customer_number] unless empty?(options[:customer_number])
-        if options[:custom_fields]
-          options[:custom_fields].each do |key, value|
-            form[key.to_s] = value
-          end
+        options[:custom_fields]&.each do |key, value|
+          form[key.to_s] = value
         end
       end
 
@@ -283,7 +281,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def custom_field?(field_name, options)
-        return true if options[:custom_fields] && options[:custom_fields].include?(field_name.to_sym)
+        return true if options[:custom_fields]&.include?(field_name.to_sym)
         field_name == :customer_number
       end
 

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
 
       self.default_currency = 'AUD'
 
-      #accepted money format
+      # accepted money format
       self.money_format = :cents
 
       # The homepage URL of the gateway

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

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

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

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

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

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

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

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

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

@@ -119,9 +119,9 @@ module ActiveMerchant #:nodoc:
         response = {}
 
         doc = Nokogiri::XML(xml)
-        doc.root.xpath('//RESPONSE/FIELDS/FIELD').each do |field|
+        doc.root&.xpath('//RESPONSE/FIELDS/FIELD')&.each do |field|
           response[field['KEY']] = field.text
-        end unless doc.root.nil?
+        end
 
         response
       end
@@ -149,7 +149,7 @@ module ActiveMerchant #:nodoc:
       def message_from(response)
         # Silly inconsistent gateway. Always make capitalized (but not all caps)
         msg = (response['auth_response'] || response['response1'])
-        msg.downcase.capitalize if msg
+        msg&.downcase&.capitalize
       end
 
       def error_code_from(response)

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

@@ -141,12 +141,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r((<Card_Number>).+(</Card_Number>)), '\1[FILTERED]\2')
-          .gsub(%r((<VerificationStr2>).+(</VerificationStr2>)), '\1[FILTERED]\2')
-          .gsub(%r((<Password>).+(</Password>))i, '\1[FILTERED]\2')
-          .gsub(%r((<CAVV>).+(</CAVV>)), '\1[FILTERED]\2')
-          .gsub(%r((Card Number : ).*\d)i, '\1[FILTERED]')
+        transcript.
+          gsub(%r((<Card_Number>).+(</Card_Number>)), '\1[FILTERED]\2').
+          gsub(%r((<VerificationStr2>).+(</VerificationStr2>)), '\1[FILTERED]\2').
+          gsub(%r((<Password>).+(</Password>))i, '\1[FILTERED]\2').
+          gsub(%r((<CAVV>).+(</CAVV>)), '\1[FILTERED]\2').
+          gsub(%r((Card Number : ).*\d)i, '\1[FILTERED]')
       end
 
       def supports_network_tokenization?
@@ -394,7 +394,7 @@ module ActiveMerchant #:nodoc:
             credit_card.last_name,
             credit_card.month,
             credit_card.year
-            ].map { |value| value.to_s.gsub(/;/, '') }.join(';')
+          ].map { |value| value.to_s.gsub(/;/, '') }.join(';')
         else
           raise StandardError, "TransArmor support is not enabled on your #{display_name} account"
         end

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

@@ -112,12 +112,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r((<Card_Number>).+(</Card_Number>)), '\1[FILTERED]\2')
-          .gsub(%r((<CVDCode>).+(</CVDCode>)), '\1[FILTERED]\2')
-          .gsub(%r((<Password>).+(</Password>))i, '\1[FILTERED]\2')
-          .gsub(%r((<CAVV>).+(</CAVV>)), '\1[FILTERED]\2')
-          .gsub(%r((CARD NUMBER\s+: )#+\d+), '\1[FILTERED]')
+        transcript.
+          gsub(%r((<Card_Number>).+(</Card_Number>)), '\1[FILTERED]\2').
+          gsub(%r((<CVDCode>).+(</CVDCode>)), '\1[FILTERED]\2').
+          gsub(%r((<Password>).+(</Password>))i, '\1[FILTERED]\2').
+          gsub(%r((<CAVV>).+(</CAVV>)), '\1[FILTERED]\2').
+          gsub(%r((CARD NUMBER\s+: )#+\d+), '\1[FILTERED]')
       end
 
       def supports_network_tokenization?

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

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

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

@@ -72,8 +72,8 @@ module ActiveMerchant #:nodoc:
       def scrub(transcript)
         transcript.
           gsub(%r((Authorization: )[^\\]*)i, '\1[FILTERED]').
-          gsub(%r(("cardNumber\\":\\")\d+), '\1[FILTERED]').
-          gsub(%r(("cvv\\":\\")\d+), '\1[FILTERED]')
+          gsub(%r(("cardNumber\\+":\\+")\d+), '\1[FILTERED]').
+          gsub(%r(("cvv\\+":\\+")\d+), '\1[FILTERED]')
       end
 
       private
@@ -230,11 +230,14 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, post, authorization = nil)
         begin
-          response = parse(ssl_post(url(action, authorization), post.to_json, headers(action, post, authorization)))
+          raw_response = ssl_post(url(action, authorization), post.to_json, headers(action, post, authorization))
+          response = parse(raw_response)
         rescue ResponseError => e
           if e.response.code.to_i >= 400
             response = parse(e.response.body)
           end
+        rescue JSON::ParserError
+          response = json_error(raw_response)
         end
 
         succeeded = success_from(response)
@@ -248,6 +251,14 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def json_error(raw_response)
+        {
+          'error_message' => 'Invalid response received from the Ingenico ePayments (formerly GlobalCollect) API.  Please contact Ingenico ePayments if you continue to receive this message.' \
+            "  (The raw response returned by the API was #{raw_response.inspect})",
+          'status' => 'REJECTED'
+        }
+      end
+
       def headers(action, post, authorization = nil)
         {
           'Content-Type'  => content_type,
@@ -286,8 +297,10 @@ EOS
         else
           if errors = response['errors']
             errors.first.try(:[], 'message')
-          elsif status = response['status']
-            'Status: ' + status
+          elsif response['error_message']
+            response['error_message']
+          elsif response['status']
+            'Status: ' + response['status']
           else
             'No message available'
           end
@@ -297,8 +310,10 @@ EOS
       def authorization_from(succeeded, response)
         if succeeded
           response['id'] || response['payment']['id'] || response['paymentResult']['payment']['id']
-        else
+        elsif response['errorId']
           response['errorId']
+        else
+          'GATEWAY ERROR'
         end
       end
 

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

@@ -204,4 +204,3 @@ EOA
     end
   end
 end
-

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

@@ -274,7 +274,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        (@options[:secret_api_key] && @options[:secret_api_key].include?('_cert_'))
+        @options[:secret_api_key]&.include?('_cert_')
       end
 
       ISSUER_MESSAGES = {

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

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

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

@@ -140,7 +140,7 @@ module ActiveMerchant #:nodoc:
         data = ssl_post self.live_url, post_data(action, parameters)
         response = parse(data)
 
-        Response.new(response[:success] , response[:message], response,
+        Response.new(response[:success], response[:message], response,
           :authorization => response[:transaction_id],
           :avs_result => { :code => response[:avs_result] },
           :cvv_result => response[:cvv_result]
@@ -160,4 +160,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-