activemerchant 1.100.0 → 1.133.0

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

@@ -9,16 +9,16 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://gatewaystage.itstgate.com/SmartPayments/transact3.asmx'
       self.live_url = 'https://gateway.itstgate.com/SmartPayments/transact3.asmx'
 
-      self.supported_countries = ['CA', 'US']
+      self.supported_countries = %w[CA 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]
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :user_name, :password)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         post = initialize_required_fields('Sale')
 
         # Allow the same amount in multiple transactions.
@@ -30,7 +30,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         post = initialize_required_fields('Auth')
 
         add_invoice(post, amount, options)
@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         post = initialize_required_fields('Force')
 
         add_invoice(post, amount, options)
@@ -50,7 +50,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = initialize_required_fields('Return')
 
         add_invoice(post, amount, options)
@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = initialize_required_fields('Void')
 
         add_reference(post, authorization)
@@ -74,10 +74,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def store(creditcard, options={})
+      def store(creditcard, options = {})
         post = initialize_required_fields('')
         post[:transaction] = 'Create'
-        post[:CardNumber]    = creditcard.number
+        post[:CardNumber] = creditcard.number
         post[:CustomerPaymentInfoKey] = ''
         post[:token] = ''
         add_payment_method(post, creditcard)
@@ -147,7 +147,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        if(billing_address = (options[:billing_address] || options[:address]))
+        if (billing_address = (options[:billing_address] || options[:address]))
           post[:Street] = billing_address[:address1]
           post[:Zip]    = billing_address[:zip]
         end
@@ -235,8 +235,8 @@ module ActiveMerchant #:nodoc:
 
       def post_data(post)
         {
-          :UserName => @options[:user_name],
-          :Password => @options[:password]
+          UserName: @options[:user_name],
+          Password: @options[:password]
         }.merge(post).collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
     end

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

@@ -5,7 +5,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.centralams.com/'
       self.display_name = 'CAMS: Central Account Management System'
@@ -67,12 +67,12 @@ module ActiveMerchant #:nodoc:
         '894' => STANDARD_ERROR_CODE[:processing_error]
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :username, :password)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         post = {}
         add_invoice(post, money, options)
 
@@ -86,7 +86,7 @@ module ActiveMerchant #:nodoc:
         commit('sale', post)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         post = {}
         add_invoice(post, money, options)
         add_payment(post, payment)
@@ -95,7 +95,7 @@ module ActiveMerchant #:nodoc:
         commit('auth', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         add_reference(post, authorization)
         add_invoice(post, money, options)
@@ -103,20 +103,20 @@ module ActiveMerchant #:nodoc:
         commit('capture', post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
         add_reference(post, authorization)
         add_invoice(post, money, options)
         commit('refund', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_reference(post, authorization)
         commit('void', post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         post = {}
         add_invoice(post, 0, options)
         add_payment(post, credit_card)
@@ -138,7 +138,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      def add_address(post, creditcard, options={})
+      def add_address(post, creditcard, options = {})
         post[:firstname] = creditcard.first_name
         post[:lastname]  = creditcard.last_name
 
@@ -167,7 +167,7 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, payment)
         post[:ccnumber] = payment.number
-        post[:ccexp] = "#{payment.month.to_s.rjust(2, "0")}#{payment.year.to_s[-2..-1]}"
+        post[:ccexp] = "#{payment.month.to_s.rjust(2, '0')}#{payment.year.to_s[-2..-1]}"
         post[:cvv] = payment.verification_value
       end
 

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

@@ -1,12 +1,12 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class CardConnectGateway < Gateway
-      self.test_url = 'https://fts.cardconnect.com:6443/cardconnect/rest/'
-      self.live_url = 'https://fts.cardconnect.com:8443/cardconnect/rest/'
+      self.test_url = 'https://fts-uat.cardconnect.com/cardconnect/rest/'
+      self.live_url = 'https://fts.cardconnect.com/cardconnect/rest/'
 
       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://cardconnect.com/'
       self.display_name = 'Card Connect'
@@ -61,6 +61,8 @@ module ActiveMerchant #:nodoc:
         '60' => STANDARD_ERROR_CODE[:pickup_card]
       }
 
+      SCHEDULED_PAYMENT_TYPES = %w(recurring installment)
+
       def initialize(options = {})
         requires!(options, :merchant_id, :username, :password)
         require_valid_domain!(options, :domain)
@@ -69,7 +71,7 @@ module ActiveMerchant #:nodoc:
 
       def require_valid_domain!(options, param)
         if options[param]
-          raise ArgumentError.new('not a valid cardconnect domain') unless /\Dcardconnect.com:\d{1,}\D/ =~ options[param]
+          raise ArgumentError.new('not a valid cardconnect domain') unless /https:\/\/\D*cardconnect.com/ =~ options[param]
         end
       end
 
@@ -87,8 +89,9 @@ module ActiveMerchant #:nodoc:
           add_currency(post, money, options)
           add_address(post, options)
           add_customer_data(post, options)
-          add_3DS(post, options)
+          add_three_ds_mpi_data(post, options)
           add_additional_data(post, options)
+          add_stored_credential(post, options)
           post[:capture] = 'Y'
           commit('auth', post)
         end
@@ -102,8 +105,9 @@ module ActiveMerchant #:nodoc:
         add_payment(post, payment)
         add_address(post, options)
         add_customer_data(post, options)
-        add_3DS(post, options)
+        add_three_ds_mpi_data(post, options)
         add_additional_data(post, options)
+        add_stored_credential(post, options)
         commit('auth', post)
       end
 
@@ -169,7 +173,7 @@ module ActiveMerchant #:nodoc:
       def add_address(post, options)
         if address = options[:billing_address] || options[:address]
           post[:address] = address[:address1] if address[:address1]
-          post[:address].concat(" #{address[:address2]}") if address[:address2]
+          post[:address2] = address[:address2] if address[:address2]
           post[:city] = address[:city] if address[:city]
           post[:region] = address[:state] if address[:state]
           post[:country] = address[:country] if address[:country]
@@ -188,7 +192,11 @@ module ActiveMerchant #:nodoc:
 
       def add_invoice(post, options)
         post[:orderid] = options[:order_id]
-        post[:ecomind] = (options[:recurring] ? 'R' : 'E')
+        post[:ecomind] = if options[:ecomind]
+                           options[:ecomind].capitalize
+                         else
+                           (options[:recurring] ? 'R' : 'E')
+                         end
       end
 
       def add_payment(post, payment)
@@ -233,7 +241,7 @@ module ActiveMerchant #:nodoc:
           post[:items] = options[:items].map do |item|
             updated = {}
             item.each_pair do |k, v|
-              updated.merge!(k.to_s.gsub(/_/, '') => v)
+              updated.merge!(k.to_s.delete('_') => v)
             end
             updated
           end
@@ -241,10 +249,20 @@ module ActiveMerchant #:nodoc:
         post[:userfields] = options[:user_fields] if options[:user_fields]
       end
 
-      def add_3DS(post, options)
-        post[:secureflag] = options[:secure_flag] if options[:secure_flag]
-        post[:securevalue] = options[:secure_value] if options[:secure_value]
-        post[:securexid] = options[:secure_xid] if options[:secure_xid]
+      def add_three_ds_mpi_data(post, options)
+        return unless three_d_secure = options[:three_d_secure]
+
+        post[:secureflag]  = three_d_secure[:eci]
+        post[:securevalue] = three_d_secure[:cavv]
+        post[:securedstid] = three_d_secure[:ds_transaction_id]
+      end
+
+      def add_stored_credential(post, options)
+        return unless stored_credential = options[:stored_credential]
+
+        post[:cof] = stored_credential[:initiator] == 'merchant' ? 'M' : 'C'
+        post[:cofscheduled] = SCHEDULED_PAYMENT_TYPES.include?(stored_credential[:reason_type]) ? 'Y' : 'N'
+        post[:cofpermission] = stored_credential[:initial_transaction] ? 'Y' : 'N'
       end
 
       def headers
@@ -287,7 +305,8 @@ module ActiveMerchant #:nodoc:
           error_code: error_code_from(response)
         )
       rescue ResponseError => e
-        return Response.new(false, 'Unable to authenticate.  Please check your credentials.', {}, :test => test?) if e.response.code == '401'
+        return Response.new(false, 'Unable to authenticate.  Please check your credentials.', {}, test: test?) if e.response.code == '401'
+
         raise
       end
 

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

@@ -6,17 +6,16 @@ module ActiveMerchant #:nodoc:
 
       self.money_format = :cents
       self.default_currency = 'GBP'
-      self.supported_cardtypes = [ :visa, :maestro, :master, :american_express, :jcb ]
-      self.supported_countries = [ 'GB' ]
+      self.supported_cardtypes = %i[visa maestro master american_express jcb]
+      self.supported_countries = ['GB']
       self.homepage_url = 'http://www.cardsave.net/'
       self.display_name = 'CardSave'
 
-      def initialize(options={})
+      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/card_stream.rb

@@ -1,14 +1,14 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class CardStreamGateway < Gateway
-
       THREEDSECURE_REQUIRED_DEPRECATION_MESSAGE = 'Specifying the :threeDSRequired initialization option is deprecated. Please use the `:threeds_required => true` *transaction* option instead.'
 
       self.test_url = self.live_url = 'https://gateway.cardstream.com/direct/'
       self.money_format = :cents
       self.default_currency = 'GBP'
-      self.supported_countries = ['GB', 'US', 'CH', 'SE', 'SG', 'NO', 'JP', 'IS', 'HK', 'NL', 'CZ', 'CA', 'AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro]
+      self.currencies_without_fractions = %w(CVE ISK JPY UGX)
+      self.supported_countries = %w[GB US CH SE SG NO JP IS HK NL CZ CA AU]
+      self.supported_cardtypes = %i[visa master american_express diners_club discover jcb maestro]
       self.homepage_url = 'http://www.cardstream.com/'
       self.display_name = 'CardStream'
 
@@ -150,30 +150,20 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, credit_card_or_reference, options = {})
         post = {}
-        add_pair(post, :captureDelay, -1)
-        add_amount(post, money, options)
-        add_invoice(post, credit_card_or_reference, money, options)
-        add_credit_card_or_reference(post, credit_card_or_reference)
-        add_customer_data(post, options)
-        add_remote_address(post, options)
+        add_auth_purchase(post, -1, money, credit_card_or_reference, options)
         commit('SALE', post)
       end
 
       def purchase(money, credit_card_or_reference, options = {})
         post = {}
-        add_pair(post, :captureDelay, 0)
-        add_amount(post, money, options)
-        add_invoice(post, credit_card_or_reference, money, options)
-        add_credit_card_or_reference(post, credit_card_or_reference)
-        add_customer_data(post, options)
-        add_remote_address(post, options)
+        add_auth_purchase(post, 0, money, credit_card_or_reference, options)
         commit('SALE', post)
       end
 
       def capture(money, authorization, options = {})
         post = {}
         add_pair(post, :xref, authorization)
-        add_pair(post, :amount, amount(money), :required => true)
+        add_pair(post, :amount, localized_amount(money, options[:currency] || currency(money)), required: true)
         add_remote_address(post, options)
 
         commit('CAPTURE', post)
@@ -184,6 +174,7 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :xref, authorization)
         add_amount(post, money, options)
         add_remote_address(post, options)
+        add_country_code(post, options)
         response = commit('REFUND_SALE', post)
 
         return response if response.success?
@@ -203,7 +194,7 @@ module ActiveMerchant #:nodoc:
         commit('CANCEL', post)
       end
 
-      def verify(creditcard, options={})
+      def verify(creditcard, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, creditcard, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -223,9 +214,21 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def add_auth_purchase(post, pair_value, money, credit_card_or_reference, options)
+        add_pair(post, :captureDelay, pair_value)
+        add_amount(post, money, options)
+        add_invoice(post, credit_card_or_reference, money, options)
+        add_credit_card_or_reference(post, credit_card_or_reference)
+        add_customer_data(post, options)
+        add_remote_address(post, options)
+        add_country_code(post, options)
+        add_threeds_fields(post, options)
+      end
+
       def add_amount(post, money, options)
-        add_pair(post, :amount, amount(money), :required => true)
-        add_pair(post, :currencyCode, currency_code(options[:currency] || currency(money)))
+        currency = options[:currency] || currency(money)
+        add_pair(post, :amount, localized_amount(money, currency), required: true)
+        add_pair(post, :currencyCode, currency_code(currency))
       end
 
       def add_customer_data(post, options)
@@ -241,15 +244,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, credit_card_or_reference, money, options)
-        add_pair(post, :transactionUnique, options[:order_id], :required => true)
-        add_pair(post, :orderRef, options[:description] || options[:order_id], :required => true)
+        add_pair(post, :transactionUnique, options[:order_id], required: true)
+        add_pair(post, :orderRef, options[:description] || options[:order_id], required: true)
         add_pair(post, :statementNarrative1, options[:merchant_name]) if options[:merchant_name]
         add_pair(post, :statementNarrative2, options[:dynamic_descriptor]) if options[:dynamic_descriptor]
         if credit_card_or_reference.respond_to?(:number)
-          if ['american_express', 'diners_club'].include?(card_brand(credit_card_or_reference).to_s)
+          if %w[american_express diners_club].include?(card_brand(credit_card_or_reference).to_s)
             add_pair(post, :item1Quantity, 1)
             add_pair(post, :item1Description, (options[:description] || options[:order_id]).slice(0, 15))
-            add_pair(post, :item1GrossValue, amount(money))
+            add_pair(post, :item1GrossValue, localized_amount(money, options[:currency] || currency(money)))
           end
         end
 
@@ -266,14 +269,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, reference)
-        add_pair(post, :xref, reference, :required => true)
+        add_pair(post, :xref, reference, required: true)
       end
 
       def add_credit_card(post, credit_card)
-        add_pair(post, :customerName, credit_card.name, :required => true)
-        add_pair(post, :cardNumber, credit_card.number, :required => true)
-        add_pair(post, :cardExpiryMonth, format(credit_card.month, :two_digits), :required => true)
-        add_pair(post, :cardExpiryYear, format(credit_card.year, :two_digits), :required => true)
+        add_pair(post, :customerName, credit_card.name, required: true)
+        add_pair(post, :cardNumber, credit_card.number, required: true)
+        add_pair(post, :cardExpiryMonth, format(credit_card.month, :two_digits), required: true)
+        add_pair(post, :cardExpiryYear, format(credit_card.year, :two_digits), required: true)
         add_pair(post, :cardCVV, credit_card.verification_value)
       end
 
@@ -281,10 +284,28 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :threeDSRequired, options[:threeds_required] || @threeds_required ? 'Y' : 'N')
       end
 
-      def add_remote_address(post, options={})
+      def add_threeds_fields(post, options)
+        return unless three_d_secure = options[:three_d_secure]
+
+        add_pair(post, :threeDSEnrolled, formatted_enrollment(three_d_secure[:enrolled]))
+        if three_d_secure[:enrolled] == 'true'
+          add_pair(post, :threeDSAuthenticated, three_d_secure[:authentication_response_status])
+          if three_d_secure[:authentication_response_status] == 'Y'
+            post[:threeDSECI]  = three_d_secure[:eci]
+            post[:threeDSCAVV] = three_d_secure[:cavv]
+            post[:threeDSXID] = three_d_secure[:xid] || three_d_secure[:ds_transaction_id]
+          end
+        end
+      end
+
+      def add_remote_address(post, options = {})
         add_pair(post, :remoteAddress, options[:ip] || '1.1.1.1')
       end
 
+      def add_country_code(post, options)
+        post[:countryCode] = options[:country_code] || self.supported_countries[0]
+      end
+
       def normalize_line_endings(str)
         str.gsub(/%0D%0A|%0A%0D|%0D/, '%0A')
       end
@@ -308,10 +329,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        parameters.update(:countryCode => self.supported_countries[0]) unless ['CAPTURE', 'CANCEL'].include?(action)
         parameters.update(
-          :merchantID => @options[:login],
-          :action => action
+          merchantID: @options[:login],
+          action: action
         )
         # adds a signature to the post hash/array
         add_hmac(parameters)
@@ -322,10 +342,10 @@ module ActiveMerchant #:nodoc:
           response[:responseCode] == '0',
           response[:responseCode] == '0' ? 'APPROVED' : response[:responseMessage],
           response,
-          :test => test?,
-          :authorization => response[:xref],
-          :cvv_result => CVV_CODE[response[:avscv2ResponseCode].to_s[0, 1]],
-          :avs_result => avs_from(response)
+          test: test?,
+          authorization: response[:xref],
+          cvv_result: CVV_CODE[response[:avscv2ResponseCode].to_s[0, 1]],
+          avs_result: avs_from(response)
         )
       end
 
@@ -341,12 +361,12 @@ module ActiveMerchant #:nodoc:
                  'A'
                else
                  'I'
-        end
+               end
 
         AVSResult.new({
-          :code => code,
-          :postal_match => postal_match,
-          :street_match => street_match
+          code: code,
+          postal_match: postal_match,
+          street_match: street_match
         })
       end
 
@@ -362,6 +382,13 @@ module ActiveMerchant #:nodoc:
         post[key] = value if !value.blank? || options[:required]
       end
 
+      def formatted_enrollment(val)
+        case val
+        when 'Y', 'N', 'U' then val
+        when true, 'true' then 'Y'
+        when false, 'false' then 'N'
+        end
+      end
     end
   end
 end

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

@@ -3,9 +3,9 @@ module ActiveMerchant #:nodoc:
     class CardknoxGateway < Gateway
       self.live_url = 'https://x1.cardknox.com/gateway'
 
-      self.supported_countries = ['US', 'CA', 'GB']
+      self.supported_countries = %w[US CA GB]
       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.cardknox.com/'
       self.display_name = 'Cardknox'
@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
         }
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :api_key)
         super
       end
@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
       # - check
       # - cardknox token, which is returned in the the authorization string "ref_num;token;command"
 
-      def purchase(amount, source, options={})
+      def purchase(amount, source, options = {})
         post = {}
         add_amount(post, amount, options)
         add_invoice(post, options)
@@ -48,7 +48,7 @@ module ActiveMerchant #:nodoc:
         commit(:purchase, source_type(source), post)
       end
 
-      def authorize(amount, source, options={})
+      def authorize(amount, source, options = {})
         post = {}
         add_amount(post, amount)
         add_invoice(post, options)
@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
         commit(:capture, source_type(authorization), post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = {}
         add_reference(post, authorization)
         add_amount(post, amount)
@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
         commit(:void, source_type(authorization), post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -116,7 +116,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, reference)
-        reference, _, _ = split_authorization(reference)
+        reference, = split_authorization(reference)
         post[:Refnum] = reference
       end
 
@@ -186,7 +186,7 @@ module ActiveMerchant #:nodoc:
           post[address_key(prefix, 'FirstName')] = address[:first_name]
           post[address_key(prefix, 'LastName')]  = address[:last_name]
         end
-        post[address_key(prefix, 'MiddleName')]  = address[:middle_name]
+        post[address_key(prefix, 'MiddleName')] = address[:middle_name]
 
         post[address_key(prefix, 'Company')]  = address[:company]
         post[address_key(prefix, 'Street')]   = address[:address1]
@@ -247,7 +247,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_cardknox_token(post, authorization)
-        _, token, _ = split_authorization(authorization)
+        _, token, = split_authorization(authorization)
 
         post[:Token] = token
       end
@@ -276,7 +276,7 @@ module ActiveMerchant #:nodoc:
           amount:            fields['xAuthAmount'],
           masked_card_num:   fields['xMaskedCardNumber'],
           masked_account_number: fields['MaskedAccountNumber']
-        }.delete_if { |k, v| v.nil? }
+        }.delete_if { |_k, v| v.nil? }
       end
 
       def commit(action, source_type, parameters)
@@ -312,7 +312,7 @@ module ActiveMerchant #:nodoc:
           Version: '4.5.4',
           SoftwareName: 'Active Merchant',
           SoftwareVersion: ActiveMerchant::VERSION.to_s,
-          Command: command,
+          Command: command
         }
 
         seed = SecureRandom.hex(32).upcase
@@ -320,7 +320,7 @@ module ActiveMerchant #:nodoc:
         initial_parameters[:Hash] = "s/#{seed}/#{hash}/n" unless @options[:pin].blank?
         parameters = initial_parameters.merge(parameters)
 
-        parameters.reject { |k, v| v.blank? }.collect { |key, value| "x#{key}=#{CGI.escape(value.to_s)}" }.join('&')
+        parameters.reject { |_k, v| v.blank? }.collect { |key, value| "x#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
                                      MT HU NL AT PL PT RO SI SK FI SE GB IS LI NO
                                      CH ME MK AL RS TR BA ]
       self.default_currency = 'EUR'
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
 
       self.homepage_url = 'https://vr-pay-ecommerce.docs.oppwa.com/'
       self.display_name = 'CardProcess VR-Pay'
@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>:user_id</tt> -- The CardProcess user ID
       # * <tt>:password</tt> -- The CardProcess password
       # * <tt>:entity_id</tt> -- The CardProcess channel or entity ID for any transactions
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :user_id, :password, :entity_id)
         super
         # This variable exists purely to allow remote tests to force error codes;
@@ -123,6 +123,7 @@ module ActiveMerchant #:nodoc:
 
       def add_invoice(post, money, options)
         return if money.nil?
+
         post[:amount] = amount(money)
         post[:currency] = (options[:currency] || currency(money))
         post[:merchantInvoiceId] = options[:merchant_invoice_id] if options[:merchant_invoice_id]
@@ -132,6 +133,7 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, payment)
         return if payment.is_a?(String)
+
         post[:paymentBrand] = payment.brand.upcase if payment.brand
         post[:card] ||= {}
         post[:card][:number] = payment.number