activemerchant 1.85.0 → 1.86.0

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

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

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

@@ -169,7 +169,7 @@ module ActiveMerchant #:nodoc:
       def build_token_request(credit_card, options)
         result = new_transaction
         add_credit_card(result, credit_card)
-        add_amount(result, 100, options) #need to make an auth request for $1
+        add_amount(result, 100, options) # need to make an auth request for $1
         add_token_request(result, options)
         add_optional_elements(result, options)
         result

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

@@ -119,10 +119,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r{(\\?"number\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]')
-          .gsub(%r{(\\?"cvc\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]')
-          .gsub(%r{(Auth-Token: )([A-Za-z0-9=]+)}, '\1[FILTERED]')
+        transcript.
+          gsub(%r{(\\?"number\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]').
+          gsub(%r{(\\?"cvc\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]').
+          gsub(%r{(Auth-Token: )([A-Za-z0-9=]+)}, '\1[FILTERED]')
       end
 
       private

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

@@ -102,7 +102,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[body.split('&').map{|x|x.split('=')}]
+        Hash[body.split('&').map{|x| x.split('=')}]
       end
 
       def commit(action, money, parameters)
@@ -158,4 +158,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -104,7 +104,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(successful?(response), message_from(response), response,
           :test => test?,
-          :authorization => build_authorization(response) ,
+          :authorization => build_authorization(response),
           :avs_result => { :code => response[:avsresult] },
           :cvv_result => response[:cardidresult]
         )

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

@@ -46,20 +46,20 @@ module ActiveMerchant
         'USD' => 840
       }
 
-      #The terminal used - only for swipe transactions, so hard coded to 32 for online
+      # The terminal used - only for swipe transactions, so hard coded to 32 for online
       EMV_TERMINAL_TYPE = 32
 
-      #Different Dispatch types
+      # Different Dispatch types
       DISPATCH_LATER  = 'LATER'
       DISPATCH_NOW    = 'NOW'
 
       # Return codes
       APPROVED = '00'
 
-      #Nominal amount to authorize for a 'dispatch later' type
-      #The nominal amount is held straight away, when the goods are ready
-      #to be dispatched, PSL is informed and the full amount is the
-      #taken.
+      # Nominal amount to authorize for a 'dispatch later' type
+      # The nominal amount is held straight away, when the goods are ready
+      # to be dispatched, PSL is informed and the full amount is the
+      # taken.
       NOMINAL_AMOUNT = 101
 
       AVS_CODE = {

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

@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
-        return unless post[:card] && post[:card].kind_of?(Hash)
+        return unless post[:card]&.kind_of?(Hash)
 
         card_address = {}
         if address = options[:billing_address] || options[:address]
@@ -253,7 +253,7 @@ module ActiveMerchant #:nodoc:
 
       def success?(response)
       return FRAUD_WARNING_CODES.concat(['0']).include?(response['errors'].first['code']) if response['errors']
-        
+
       !['DECLINED', 'CANCELLED'].include?(response['status'])
       end
 

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

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

data/lib/active_merchant/billing/gateways/quickpay/quickpay_common.rb

@@ -1,4 +1,3 @@
-
 module QuickpayCommon
   MD5_CHECK_FIELDS = {
     3 => {
@@ -137,9 +136,9 @@ module QuickpayCommon
 
       :chstatus  => %w(protocol msgtype merchant apikey)
     },
-    
+
     10 => {
-      :authorize => %w(mobile_number acquirer autofee customer_id extras 
+      :authorize => %w(mobile_number acquirer autofee customer_id extras
                        zero_auth customer_ip),
       :capture   => %w( extras ),
       :cancel    => %w( extras ),
@@ -149,7 +148,7 @@ module QuickpayCommon
       :recurring => %w(auto_capture autofee zero_auth)
     }
   }
-  
+
   RESPONSE_CODES = {
     200 => 'OK',
     201 => 'Created',
@@ -164,18 +163,18 @@ module QuickpayCommon
     409 => 'Conflict',
     500 => 'Internal Server Error'
   }
-  
+
   def self.included(base)
     base.default_currency = 'DKK'
     base.money_format = :cents
-    
-    base.supported_cardtypes = [:dankort, :forbrugsforeningen, :visa, :master, 
+
+    base.supported_cardtypes = [:dankort, :forbrugsforeningen, :visa, :master,
                                 :american_express, :diners_club, :jcb, :maestro]
     base.supported_countries = ['DE', 'DK', 'ES', 'FI', 'FR', 'FO', 'GB', 'IS', 'NO', 'SE']
     base.homepage_url = 'http://quickpay.net/'
     base.display_name = 'QuickPay'
   end
-    
+
   def expdate(credit_card)
     year  = format(credit_card.year, :two_digits)
     month = format(credit_card.month, :two_digits)

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v4to7.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class QuickpayV4to7Gateway < Gateway
       include QuickpayCommon
-      self.live_url = self.test_url = 'https://secure.quickpay.dk/api'    
+      self.live_url = self.test_url = 'https://secure.quickpay.dk/api'
       APPROVED = '000'
 
       # The login is the QuickpayId
@@ -224,4 +224,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -136,7 +136,7 @@ module ActiveMerchant #:nodoc:
             xml.Holder        "#{payment_method.first_name} #{payment_method.last_name}"
             xml.Brand         payment_method.brand
             xml.Expiry(year: payment_method.year, month: payment_method.month)
-            xml.Verification  payment_method.verification_value
+            xml.Verification payment_method.verification_value
           end
         end
       end

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

@@ -52,8 +52,8 @@ module ActiveMerchant #:nodoc:
       OPTIONAL_REQUEST_FIELDS = {
         paypal_callback_url: :PayPalCallbackURL,
         basket: :Basket,
-        gift_aid_payment: :GiftAidPayment ,
-        apply_avscv2: :ApplyAVSCV2 ,
+        gift_aid_payment: :GiftAidPayment,
+        apply_avscv2: :ApplyAVSCV2,
         apply_3d_secure: :Apply3DSecure,
         account_type: :AccountType,
         billing_agreement: :BillingAgreement,
@@ -63,9 +63,9 @@ module ActiveMerchant #:nodoc:
         vendor_data: :VendorData,
         language: :Language,
         website: :Website,
-        recipient_account_number: :FIRecipientAcctNumber ,
-        recipient_surname: :FIRecipientSurname ,
-        recipient_postcode: :FIRecipientPostcode ,
+        recipient_account_number: :FIRecipientAcctNumber,
+        recipient_surname: :FIRecipientSurname,
+        recipient_postcode: :FIRecipientPostcode,
         recipient_dob: :FIRecipientDoB
       }
 

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

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

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

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

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

@@ -238,7 +238,6 @@ module ActiveMerchant #:nodoc:
 
       def commit_periodic(request)
         my_request = build_periodic_request(request)
-        #puts my_request
         response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, my_request))
 
         Response.new(success?(response), message_from(response), response,

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

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

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

@@ -73,11 +73,11 @@ module ActiveMerchant #:nodoc:
       def store(credit_card, options = {})
         if options[:customer_id].blank?
           MultiResponse.run() do |r|
-            #create charge object
+            # create charge object
             r.process { authorize(100, credit_card, options) }
-            #create customer and save card
+            # create customer and save card
             r.process { create_customer_add_card(r.authorization, options) }
-            #void the charge
+            # void the charge
             r.process(:ignore_result) { void(r.params['metadata']['chargeId'], options) }
           end
         else
@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
-        return unless post[:card] && post[:card].kind_of?(Hash)
+        return unless post[:card]&.kind_of?(Hash)
         if address = options[:billing_address]
           post[:card][:addressLine1] = address[:address1] if address[:address1]
           post[:card][:addressLine2] = address[:address2] if address[:address2]
@@ -257,7 +257,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        (@options[:secret_key] && @options[:secret_key].include?('_test_'))
+        (@options[:secret_key]&.include?('_test_'))
       end
     end
   end

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

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

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

@@ -386,7 +386,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
-        return unless post[:card] && post[:card].kind_of?(Hash)
+        return unless post[:card]&.kind_of?(Hash)
         if address = options[:billing_address] || options[:address]
           post[:card][:address_line1] = address[:address1] if address[:address1]
           post[:card][:address_line2] = address[:address2] if address[:address2]

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

@@ -6,10 +6,7 @@ module ActiveMerchant #:nodoc:
       TRANSACTION_APPROVED_MSG = 'Transaction approved'
       TRANSACTION_DECLINED_MSG = 'Transaction declined'
 
-      LIVE_URLS = {
-        'NZ' => 'https://api.swipehq.com',
-        'CA' => 'https://api.swipehq.ca'
-      }
+      self.live_url = 'https://api.swipehq.com'
       self.test_url = 'https://api.swipehq.com'
 
       TRANSACTION_API = '/createShopifyTransaction.php'
@@ -135,11 +132,11 @@ module ActiveMerchant #:nodoc:
 
         # ssl_post() returns the response body as a string on success,
         # or raises a ResponseError exception on failure
-        JSON.parse(ssl_post(url(@options[:region], api), params.to_query))
+        JSON.parse(ssl_post(url(api), params.to_query))
       end
 
-      def url(region, api)
-        ((test? ? self.test_url : LIVE_URLS[region]) + api)
+      def url(api)
+        (test? ? self.test_url : self.live_url) + api
       end
 
       def build_error_response(message, params={})
@@ -153,4 +150,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -214,7 +214,7 @@ module ActiveMerchant #:nodoc:
         response = {}
 
         doc = Nokogiri::XML(xml)
-        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
@@ -223,7 +223,7 @@ module ActiveMerchant #:nodoc:
               response[name.to_sym] = childnode.text
             end
           end
-        end unless doc.root.nil?
+        end
 
         response
       end

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

@@ -4,20 +4,19 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class TransaxGateway < SmartPs
       self.live_url = self.test_url = 'https://secure.nelixtransax.net/api/transact.php'
-      
+
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['US']
-      
+
       # The card types supported by the payment gateway
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      
+
       # The homepage URL of the gateway
       self.homepage_url = 'https://www.nelixtransax.com/'
-      
+
       # The name of the gateway
       self.display_name = 'NELiX TransaX'
 
     end
   end
 end
-

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

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

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

@@ -154,21 +154,21 @@ module ActiveMerchant #:nodoc:
         result['X-Safe-Card'] = params[:safe_card] if params[:safe_card]
         result
       end
-      
+
       def commit(method, action, params, options)
         url = "#{test? ? test_url : live_url}/#{action}"
         raw_response = ssl_request(method, url, post_data(params), headers(options))
         parsed_response = parse(raw_response)
-        success_response(parsed_response) 
+        success_response(parsed_response)
       rescue ResponseError => e
         error_response(parse(e.response.body))
       rescue JSON::ParserError
         unparsable_response(raw_response)
       end
-  
+
       def success_response(body)
         return invalid_response unless body['response']
-      
+
         response = body['response']
         Response.new(
           true,
@@ -195,7 +195,7 @@ module ActiveMerchant #:nodoc:
         message += " (The raw response returned by the API was #{raw_response.inspect})"
         return Response.new(false, message)
       end
-      
+
       def invalid_response
         message = 'Invalid response.'
         return Response.new(false, message)
@@ -207,7 +207,7 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         return {} if body.blank?
-        JSON.parse(body) 
+        JSON.parse(body)
       end
 
       def post_data(parameters = {})

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

@@ -19,10 +19,10 @@ module ActiveMerchant #:nodoc:
     # Next, create a credit card object using a TC approved test card.
     #
     #   creditcard = ActiveMerchant::Billing::CreditCard.new(
-    #	    :number => '4111111111111111',
-    #	    :month => 8,
-    #	    :year => 2006,
-    #	    :first_name => 'Longbob',
+    #     :number => '4111111111111111',
+    #     :month => 8,
+    #     :year => 2006,
+    #     :first_name => 'Longbob',
     #     :last_name => 'Longsen'
     #   )
     #
@@ -353,7 +353,7 @@ module ActiveMerchant #:nodoc:
           params[:shipto_address2] = shipping_address[:address2] unless shipping_address[:address2].blank?
           params[:shipto_city]     = shipping_address[:city]     unless shipping_address[:city].blank?
           params[:shipto_state]    = shipping_address[:state]    unless shipping_address[:state].blank?
-          params[:shipto_zip]	     = shipping_address[:zip]      unless shipping_address[:zip].blank?
+          params[:shipto_zip]      = shipping_address[:zip]      unless shipping_address[:zip].blank?
           params[:shipto_country]  = shipping_address[:country]  unless shipping_address[:country].blank?
         end
       end

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.abstract_class = true
 
       ##
-      # Creates an instance of UsaEpayTransactionGateway by default, but if 
+      # Creates an instance of UsaEpayTransactionGateway by default, but if
       # :software id or :live_url are passed in the options hash it will
       # create an instance of UsaEpayAdvancedGateway.
       #

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

@@ -1310,7 +1310,7 @@ module ActiveMerchant #:nodoc:
         if options[:payment_methods]
           length = options[:payment_methods].length
           soap.PaymentMethods 'SOAP-ENC:arrayType' => "ns1:PaymentMethod[#{length}]",
-            'xsi:type' =>'ns1:PaymentMethodArray' do
+                              'xsi:type' =>'ns1:PaymentMethodArray' do
             build_customer_payment_methods soap, options
           end
         end