activemerchant 1.107.2 → 1.110.0

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

@@ -5,7 +5,7 @@ module ActiveMerchant
 
       self.supported_countries = %w(AU CA CN FR DE GI IL MT MU MX NL NZ PA PH RU SG KR ES KN GB US)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express discover jcb diners_club]
 
       self.homepage_url = 'http://www.ezic.com/'
       self.display_name = 'Ezic'

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['AU']
       self.default_currency = 'AUD'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express, :jcb]
+      self.supported_cardtypes = %i[visa master american_express jcb]
 
       self.homepage_url = 'https://www.fatzebra.com.au/'
       self.display_name = 'Fat Zebra'
@@ -48,7 +48,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        txn_id, _ = authorization.to_s.split('|')
+        txn_id, = authorization.to_s.split('|')
         post = {}
 
         add_amount(post, money, options)
@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options={})
-        txn_id, _ = authorization.to_s.split('|')
+        txn_id, = authorization.to_s.split('|')
         post = {}
 
         add_extra_options(post, options)
@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
           post[:cvv] = creditcard.verification_value if creditcard.verification_value?
           post[:card_holder] = creditcard.name if creditcard.name
         elsif creditcard.is_a?(String)
-          id, _ = creditcard.to_s.split('|')
+          id, = creditcard.to_s.split('|')
           post[:card_token] = id
           post[:cvv] = options[:cvv]
         elsif creditcard.is_a?(Hash)

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'CAD'
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.federatedcanada.com/'

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

@@ -7,10 +7,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://entegrasyon.asseco-see.com.tr/fim/api'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['US', 'TR']
+      self.supported_countries = %w[US TR]
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = %i[visa master]
 
       # The homepage URL of the gateway
       self.homepage_url = 'https://www.fbwebpos.com/'

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://api.firstgiving.com'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://www.firstgiving.com/'
       self.default_currency = 'USD'
       self.display_name = 'FirstGiving'

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
       self.default_currency = 'USD'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'http://1stpaygateway.net/'
       self.display_name = '1stPayGateway.Net'

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

@@ -22,7 +22,7 @@ module ActiveMerchant #:nodoc:
 
       SUCCESS = 'true'
 
-      SENSITIVE_FIELDS = [:verification_str2, :expiry_date, :card_number]
+      SENSITIVE_FIELDS = %i[verification_str2 expiry_date card_number]
 
       BRANDS = {
         visa: 'Visa',
@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
       DEFAULT_ECI = '07'
 
       self.supported_cardtypes = BRANDS.keys
-      self.supported_countries = ['CA', 'US']
+      self.supported_countries = %w[CA US]
       self.default_currency = 'USD'
       self.homepage_url = 'http://www.firstdata.com'
       self.display_name = 'FirstData Global Gateway e4'
@@ -217,7 +217,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_identification(xml, identification)
-        authorization_num, transaction_tag, _ = identification.split(';')
+        authorization_num, transaction_tag, = identification.split(';')
 
         xml.tag! 'Authorization_Num', authorization_num
         xml.tag! 'Transaction_Tag', transaction_tag
@@ -255,14 +255,14 @@ module ActiveMerchant #:nodoc:
             (credit_card.respond_to?(:eci) ? credit_card.eci : nil) || options[:eci] || DEFAULT_ECI
           end
 
-        xml.tag! 'Ecommerce_Flag', eci.to_s =~ /^[0-9]+$/ ? eci.to_s.rjust(2, '0') : eci
+        xml.tag! 'Ecommerce_Flag', /^[0-9]+$/.match?(eci.to_s) ? eci.to_s.rjust(2, '0') : eci
       end
 
       def add_credit_card_verification_strings(xml, credit_card, options)
         address = options[:billing_address] || options[:address]
         if address
           address_values = []
-          [:address1, :zip, :city, :state, :country].each { |part| address_values << address[part].to_s }
+          %i[address1 zip city state country].each { |part| address_values << address[part].to_s.tr("\r\n", ' ').strip }
           xml.tag! 'VerificationStr1', address_values.join('|')
         end
 

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

@@ -16,7 +16,7 @@ module ActiveMerchant #:nodoc:
 
       SUCCESS = 'true'
 
-      SENSITIVE_FIELDS = [:cvdcode, :expiry_date, :card_number]
+      SENSITIVE_FIELDS = %i[cvdcode expiry_date card_number]
 
       BRANDS = {
         visa: 'Visa',
@@ -29,7 +29,7 @@ module ActiveMerchant #:nodoc:
       DEFAULT_ECI = '07'
 
       self.supported_cardtypes = BRANDS.keys
-      self.supported_countries = ['CA', 'US']
+      self.supported_countries = %w[CA US]
       self.default_currency = 'USD'
       self.homepage_url = 'http://www.firstdata.com'
       self.display_name = 'FirstData Global Gateway e4 v27'
@@ -191,7 +191,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_identification(xml, identification)
-        authorization_num, transaction_tag, _ = identification.split(';')
+        authorization_num, transaction_tag, = identification.split(';')
 
         xml.tag! 'Authorization_Num', authorization_num
         xml.tag! 'Transaction_Tag', transaction_tag
@@ -229,7 +229,7 @@ module ActiveMerchant #:nodoc:
                 (credit_card.respond_to?(:eci) ? credit_card.eci : nil) || options[:eci] || DEFAULT_ECI
               end
 
-        xml.tag! 'Ecommerce_Flag', eci.to_s =~ /^[0-9]+$/ ? eci.to_s.rjust(2, '0') : eci
+        xml.tag! 'Ecommerce_Flag', /^[0-9]+$/.match?(eci.to_s) ? eci.to_s.rjust(2, '0') : eci
       end
 
       def add_credit_card_verification_strings(xml, credit_card, options)
@@ -287,6 +287,8 @@ module ActiveMerchant #:nodoc:
 
       def add_address(xml, options)
         if (address = options[:billing_address] || options[:address])
+          address = strip_line_breaks(address)
+
           xml.tag! 'Address' do
             xml.tag! 'Address1', address[:address1]
             xml.tag! 'Address2', address[:address2] if address[:address2]
@@ -299,6 +301,12 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def strip_line_breaks(address)
+        return unless address.is_a?(Hash)
+
+        Hash[address.map { |k, s| [k, s&.tr("\r\n", ' ')&.strip] }]
+      end
+
       def add_invoice(xml, options)
         xml.tag! 'Reference_No', options[:order_id]
         xml.tag! 'Reference_3',  options[:description] if options[:description]

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['NZ']
       self.default_currency = 'NZD'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express diners_club]
 
       BRAND_MAP = {
         'visa' => 'VISA',
@@ -142,15 +142,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def envelope_wrap(action, body)
-        <<-EOS
-<?xml version="1.0" encoding="utf-8"?>
-<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
-  <soap12:Body>
-    <#{action} xmlns="http://www.flo2cash.co.nz/webservices/paymentwebservice">
-      #{body}
-    </#{action}>
-  </soap12:Body>
-</soap12:Envelope>
+        <<~EOS
+          <?xml version="1.0" encoding="utf-8"?>
+          <soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
+            <soap12:Body>
+              <#{action} xmlns="http://www.flo2cash.co.nz/webservices/paymentwebservice">
+                #{body}
+              </#{action}>
+            </soap12:Body>
+          </soap12:Envelope>
         EOS
       end
 

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'https://www.forte.net'
       self.display_name = 'Forte'
@@ -24,7 +24,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         add_shipping_address(post, options)
         post[:action] = 'sale'
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         add_shipping_address(post, options)
         post[:action] = 'authorize'
@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         post[:action] = 'disburse'
 
@@ -151,21 +151,22 @@ module ActiveMerchant #:nodoc:
         post[:shipping_address][:physical_address][:locality] = address[:city] if address[:city]
       end
 
-      def add_payment_method(post, payment_method)
+      def add_payment_method(post, payment_method, options)
         if payment_method.respond_to?(:brand)
           add_credit_card(post, payment_method)
         else
-          add_echeck(post, payment_method)
+          add_echeck(post, payment_method, options)
         end
       end
 
-      def add_echeck(post, payment)
+      def add_echeck(post, payment, options)
         post[:echeck] = {}
         post[:echeck][:account_holder] = payment.name
         post[:echeck][:account_number] = payment.account_number
         post[:echeck][:routing_number] = payment.routing_number
         post[:echeck][:account_type] = payment.account_type
         post[:echeck][:check_number] = payment.number
+        post[:echeck][:sec_code] = options[:sec_code] || 'PPD'
       end
 
       def add_credit_card(post, payment)
@@ -259,7 +260,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def transaction_id_from(authorization)
-        transaction_id, _, original_auth_transaction_id, _ = split_authorization(authorization)
+        transaction_id, _, original_auth_transaction_id, = split_authorization(authorization)
         original_auth_transaction_id.present? ? original_auth_transaction_id : transaction_id
       end
     end

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

@@ -5,10 +5,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://sanalposprovtest.garanti.com.tr/VPServlet'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['US', 'TR']
+      self.supported_countries = %w[US TR]
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       # The homepage URL of the gateway
       self.homepage_url = 'https://sanalposweb.garanti.com.tr'

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

@@ -291,11 +291,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def auth_digest(action, post, authorization = nil)
-        data = <<-EOS
-POST
-#{content_type}
-#{date}
-#{uri(action, authorization)}
+        data = <<~EOS
+          POST
+          #{content_type}
+          #{date}
+          #{uri(action, authorization)}
         EOS
         digest = OpenSSL::Digest.new('sha256')
         key = @options[:secret_api_key]

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(CA PR US)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
       self.homepage_url = 'https://www.globalpaymentsinc.com'
       self.display_name = 'Global Transport'

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['IN']
       self.default_currency = 'INR'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :discover, :diners_club]
+      self.supported_cardtypes = %i[visa master discover diners_club]
 
       def initialize(options={})
         requires!(options, :login, :password)
@@ -81,14 +81,14 @@ module ActiveMerchant #:nodoc:
         post[:udf2] = escape(options[:email]) if options[:email]
         if address = (options[:billing_address] || options[:address])
           post[:udf3] = escape(address[:phone]) if address[:phone]
-          post[:udf4] = escape(<<EOA)
-#{address[:name]}
-#{address[:company]}
-#{address[:address1]}
-#{address[:address2]}
-#{address[:city]} #{address[:state]} #{address[:zip]}
-#{address[:country]}
-EOA
+          post[:udf4] = escape(<<~EOA)
+            #{address[:name]}
+            #{address[:company]}
+            #{address[:address1]}
+            #{address[:address2]}
+            #{address[:city]} #{address[:state]} #{address[:zip]}
+            #{address[:country]}
+          EOA
         end
       end
 

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jbc, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express discover jbc diners_club]
 
       self.homepage_url = 'http://developer.heartlandpaymentsystems.com/SecureSubmit/'
       self.display_name = 'Heartland Payment Systems'
@@ -201,9 +201,9 @@ module ActiveMerchant #:nodoc:
           xml.hps :RoutingNumber, check.routing_number
           xml.hps :AccountNumber, check.account_number
           xml.hps :CheckNumber, check.number
-          xml.hps :AccountType, check.account_type.upcase
+          xml.hps :AccountType, check.account_type&.upcase
         end
-        xml.hps :CheckType, check.account_holder_type.upcase
+        xml.hps :CheckType, check.account_holder_type&.upcase
       end
 
       def add_details(xml, options)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(AU BR CA CH DE DK ES FI FR GR HK IE IT NL NO PT SE SG TR GB US TH ID PH BE)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'http://home.iatspayments.com/'
       self.display_name = 'iATS Payments'
@@ -260,7 +260,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(action, response)
-        if [:store, :unstore].include?(action)
+        if %i[store unstore].include?(action)
           response[:customercode]
         elsif [:purchase_check].include?(action)
           response[:transaction_id] ? "#{response[:transaction_id]}|check" : nil

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = self.test_url = 'https://secure.inspiregateway.net/api/transact.php'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = %i[visa master american_express]
       self.homepage_url = 'http://www.inspiregateway.com'
       self.display_name = 'Inspire Commerce'
 

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.money_format = :dollars
       self.default_currency = 'USD'
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.instapayllc.com'

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://demo.ippayments.com.au/interface/api/dts.asmx'
 
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
 
       self.homepage_url = 'http://www.ippayments.com.au/'
       self.display_name = 'IPP'

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

@@ -10,12 +10,12 @@ module ActiveMerchant #:nodoc:
       self.live_url = self.test_url = 'https://gw1.iridiumcorp.net/'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['GB', 'ES']
+      self.supported_countries = %w[GB ES]
       self.default_currency = 'EUR'
       self.money_format = :cents
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :maestro, :jcb, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express discover maestro jcb diners_club]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.iridiumcorp.co.uk/'
@@ -288,7 +288,7 @@ module ActiveMerchant #:nodoc:
 
       def build_reference_request(type, money, authorization, options)
         options[:action] = 'CrossReferenceTransaction'
-        order_id, cross_reference, _ = authorization.split(';')
+        order_id, cross_reference, = authorization.split(';')
         build_request(options) do |xml|
           if money
             currency = options[:currency] || currency(money)