activemerchant 1.107.4 → 1.112.0

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
 
       # 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://www.nelixtransax.com/'

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
                                     GI GR HK HU ID IE IL IM IN IS IT JO KW LB LI LK LT LU LV MC
                                     MT MU MV MX MY NL NO NZ OM PH PL PT QA RO SA SE SG SI SK SM
                                     TR TT UM US VA VN ZA)
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = %i[visa master american_express]
       self.homepage_url = 'https://trexle.com'
       self.display_name = 'Trexle'
 
@@ -137,7 +137,7 @@ module ActiveMerchant #:nodoc:
             name: creditcard.name
           )
         elsif creditcard.kind_of?(String)
-          if creditcard =~ /^token_/
+          if /^token_/.match?(creditcard)
             post[:card_token] = creditcard
           else
             post[:customer_token] = creditcard

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

@@ -67,7 +67,7 @@ module ActiveMerchant #:nodoc:
     class TrustCommerceGateway < Gateway
       self.live_url = self.test_url = 'https://vault.trustcommerce.com/trans/'
 
-      SUCCESS_TYPES = ['approved', 'accepted']
+      SUCCESS_TYPES = %w[approved accepted]
 
       DECLINE_CODES = {
         'decline'       => 'The credit card was declined',
@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
       VOIDABLE_ACTIONS = %w(preauth sale postauth credit)
 
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :discover, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master discover american_express diners_club jcb]
       self.supported_countries = ['US']
       self.homepage_url = 'http://www.trustcommerce.com/'
       self.display_name = 'TrustCommerce'
@@ -185,7 +185,7 @@ module ActiveMerchant #:nodoc:
       # postauth, we preserve active_merchant's nomenclature of capture() for consistency with the rest of the library. To process
       # a postauthorization with TC, you need an amount in cents or a money object, and a TC transid.
       def capture(money, authorization, options = {})
-        transaction_id, _ = split_authorization(authorization)
+        transaction_id, = split_authorization(authorization)
         parameters = {
           amount: amount(money),
           transid: transaction_id,
@@ -199,7 +199,7 @@ module ActiveMerchant #:nodoc:
       # refund() allows you to return money to a card that was previously billed. You need to supply the amount, in cents or a money object,
       # that you want to refund, and a TC transid for the transaction that you are refunding.
       def refund(money, identification, options = {})
-        transaction_id, _ = split_authorization(identification)
+        transaction_id, = split_authorization(identification)
 
         parameters = {
           amount: amount(money),
@@ -262,7 +262,7 @@ module ActiveMerchant #:nodoc:
       def recurring(money, creditcard, options = {})
         ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
 
-        requires!(options, [:periodicity, :bimonthly, :monthly, :biweekly, :weekly, :yearly, :daily])
+        requires!(options, %i[periodicity bimonthly monthly biweekly weekly yearly daily])
 
         cycle =
           case options[:periodicity]

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

@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
       FAILURE_MESSAGE = 'Default Failure' #:nodoc:
 
       self.supported_countries = ['US']
-      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 = 'http://www.usaepay.com/'
       self.display_name = 'USA ePay Advanced SOAP Interface'
 
@@ -676,9 +676,9 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      TRANSACTION_METHODS = [
-        :run_sale, :run_auth_only, :run_credit,
-        :run_check_sale, :run_check_credit
+      TRANSACTION_METHODS = %i[
+        run_sale run_auth_only run_credit
+        run_check_sale run_check_credit
       ] #:nodoc:
 
       TRANSACTION_METHODS.each do |method|
@@ -1336,7 +1336,7 @@ module ActiveMerchant #:nodoc:
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::CreditCard)
           build_tag soap, :string, 'CardNumber', payment_method[:method].number
           build_tag soap, :string, 'CardExpiration',
-            "#{"%02d" % payment_method[:method].month}#{payment_method[:method].year.to_s[-2..-1]}"
+            "#{'%02d' % payment_method[:method].month}#{payment_method[:method].year.to_s[-2..-1]}"
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
             build_tag soap, :string, 'AvsZip', options[:billing_address][:zip]
@@ -1432,7 +1432,7 @@ module ActiveMerchant #:nodoc:
       def build_card_expiration(options)
         month = options[:payment_method].month
         year  = options[:payment_method].year
-        "#{"%02d" % month}#{year.to_s[-2..-1]}" unless month.nil? || year.nil?
+        "#{'%02d' % month}#{year.to_s[-2..-1]}" unless month.nil? || year.nil?
       end
 
       def build_check_data(soap, options)

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://www.usaepay.com/gate'
       self.test_url = 'https://sandbox.usaepay.com/gate'
 
-      self.supported_cardtypes  = [:visa, :master, :american_express]
+      self.supported_cardtypes  = %i[visa master american_express]
       self.supported_countries  = ['US']
       self.homepage_url         = 'http://www.usaepay.com/'
       self.display_name         = 'USA ePay'

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

@@ -10,7 +10,7 @@ module ActiveMerchant
 
       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 = 'http://vancopayments.com/'
       self.display_name = 'Vanco Payment Solutions'

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

@@ -5,8 +5,8 @@ module ActiveMerchant #:nodoc:
     class VerifiGateway < Gateway
       class VerifiPostData < PostData
         # Fields that will be sent even if they are blank
-        self.required_fields = [:amount, :type, :ccnumber, :ccexp, :firstname, :lastname,
-                                :company, :address1, :address2, :city, :state, :zip, :country, :phone]
+        self.required_fields = %i[amount type ccnumber ccexp firstname lastname
+                                  company address1 address2 city state zip country phone]
       end
 
       self.live_url = self.test_url = 'https://secure.verifi.com/gw/api/transact.php'
@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
       }
 
       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.verifi.com/'
       self.display_name = 'Verifi'
 

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

@@ -14,7 +14,7 @@ module ActiveMerchant #:nodoc:
 
       APPROVED = '0'
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.supported_countries = ['US']
       self.display_name = 'ViaKLIX'
       self.homepage_url = 'http://viaklix.com'

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

@@ -8,10 +8,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://devapi.vnforapps.com/api.tokenization/api/v2/merchant'
       self.live_url = 'https://api.vnforapps.com/api.tokenization/api/v2/merchant'
 
-      self.supported_countries = ['US', 'PE']
+      self.supported_countries = %w[US PE]
       self.default_currency = 'PEN'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       def initialize(options={})
         requires!(options, :access_key_id, :secret_access_key, :merchant_id)
@@ -98,7 +98,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_auth_order_id(params, authorization, options)
-        purchase_number, _ = split_authorization(authorization)
+        purchase_number, = split_authorization(authorization)
         params[:purchaseNumber] = purchase_number
         params[:externalTransactionId] = options[:order_id]
       end

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['JP']
       self.default_currency = 'JPY'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express jcb diners_club]
 
       self.homepage_url = 'https://webpay.jp/'
       self.display_name = 'WebPay'

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

@@ -4,8 +4,8 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://stage.wepayapi.com/v2'
       self.live_url = 'https://wepayapi.com/v2'
 
-      self.supported_countries = ['US', 'CA']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_countries = %w[US CA]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'https://www.wepay.com/'
       self.default_currency = 'USD'
       self.display_name = 'WePay'

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

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
       # number 5551234 within area code 202 (country code 1).
       VALID_PHONE_FORMAT = /\+\d{1,3}(\(?\d{3}\)?)?\d{3}-\d{4}-\d{3}/
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
       self.supported_countries = %w(AD CY GI IM MT RO CH AT DK GR IT MC SM TR BE EE HU LV NL SK GB BG FI IS LI NO SI VA FR IL LT PL ES CZ DE IE LU PT SE)
       self.homepage_url = 'http://www.wirecard.com'
       self.display_name = 'Wirecard'

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

@@ -279,49 +279,49 @@ module ActiveMerchant #:nodoc:
         # Gateway expects fields in fixed order below.
         case action
         when 'PAYMENT', 'PREAUTH'
-          [
-            :orderid,
-            :terminalid,
-            :amount,
-            :datetime,
-            :cardnumber, :cardtype, :cardexpiry, :cardholdername,
-            :hash,
-            :currency,
-            :terminaltype,
-            :transactiontype,
-            :email,
-            :cvv,
-            :address1, :address2,
-            :postcode,
-            :description,
-            :city, :country,
-            :ipaddress
+          %i[
+            orderid
+            terminalid
+            amount
+            datetime
+            cardnumber cardtype cardexpiry cardholdername
+            hash
+            currency
+            terminaltype
+            transactiontype
+            email
+            cvv
+            address1 address2
+            postcode
+            description
+            city country
+            ipaddress
           ]
         when 'PREAUTHCOMPLETION'
-          [:uniqueref, :terminalid, :amount, :datetime, :hash]
+          %i[uniqueref terminalid amount datetime hash]
         when 'REFUND'
-          [:uniqueref, :terminalid, :amount, :datetime, :hash,
-           :operator, :reason]
+          %i[uniqueref terminalid amount datetime hash
+             operator reason]
         when 'VOID'
           [:uniqueref]
         when 'SECURECARDREGISTRATION'
-          [
-            :merchantref,
-            :terminalid,
-            :datetime,
-            :cardnumber, :cardexpiry, :cardtype, :cardholdername,
-            :hash,
-            :dontchecksecurity,
-            :cvv,
-            :issueno
+          %i[
+            merchantref
+            terminalid
+            datetime
+            cardnumber cardexpiry cardtype cardholdername
+            hash
+            dontchecksecurity
+            cvv
+            issueno
           ]
         when 'SECURECARDREMOVAL'
-          [
-            :merchantref,
-            :cardreference,
-            :terminalid,
-            :datetime,
-            :hash
+          %i[
+            merchantref
+            cardreference
+            terminalid
+            datetime
+            hash
           ]
         end
       end

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'GBP'
       self.money_format = :cents
       self.supported_countries = %w(HK GB AU AD AR BE BR CA CH CN CO CR CY CZ DE DK ES FI FR GI GR HU IE IN IT JP LI LU MC MT MY MX NL NO NZ PA PE PL PT SE SG SI SM TR UM VA)
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :elo, :naranja, :cabal]
+      self.supported_cardtypes = %i[visa master american_express discover jcb maestro elo naranja cabal]
       self.currencies_without_fractions = %w(HUF IDR ISK JPY KRW)
       self.currencies_with_three_decimal_places = %w(BHD KWD OMR RSD TND)
       self.homepage_url = 'http://www.worldpay.com/'
@@ -217,7 +217,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def order_tag_attributes(options)
-        { 'orderCode' => options[:order_id], 'installationId' => options[:inst_id] || @options[:inst_id] }.reject { |_, v| !v }
+        { 'orderCode' => options[:order_id], 'installationId' => options[:inst_id] || @options[:inst_id] }.reject { |_, v| !v.present? }
       end
 
       def build_capture_request(money, authorization, options)
@@ -406,7 +406,7 @@ module ActiveMerchant #:nodoc:
       def add_three_d_secure(three_d_secure, xml)
         xml.info3DSecure do
           xml.threeDSVersion three_d_secure[:version]
-          if three_d_secure[:version] =~ /^2/
+          if /^2/.match?(three_d_secure[:version])
             xml.dsTransactionId three_d_secure[:ds_transaction_id]
           else
             xml.xid three_d_secure[:xid]
@@ -429,7 +429,7 @@ module ActiveMerchant #:nodoc:
         xml.cardHolderName card_holder_name
         xml.cvc payment_method.verification_value
 
-        add_address(xml, (options[:billing_address] || options[:address]))
+        add_address(xml, (options[:billing_address] || options[:address]), options)
       end
 
       def add_stored_credential_options(xml, options={})
@@ -485,7 +485,7 @@ module ActiveMerchant #:nodoc:
         xml.authenticatedShopperID options[:customer] if options[:customer]
       end
 
-      def add_address(xml, address)
+      def add_address(xml, address, options)
         return unless address
 
         address = address_with_defaults(address)
@@ -500,7 +500,7 @@ module ActiveMerchant #:nodoc:
             xml.address2 address[:address2] if address[:address2]
             xml.postalCode address[:zip]
             xml.city address[:city]
-            xml.state address[:state]
+            xml.state address[:state] unless address[:country] != 'US' && options[:execute_threed]
             xml.countryCode address[:country]
             xml.telephoneNumber address[:phone] if address[:phone]
           end
@@ -663,7 +663,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def required_status_message(raw, success_criteria)
-        "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(" or ")} is required." if !success_criteria.include?(raw[:last_event])
+        "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(' or ')} is required." if !success_criteria.include?(raw[:last_event])
       end
 
       def authorization_from(action, raw, options)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
 
       self.supported_countries = %w(HK US GB BE CH CZ DE DK ES FI FR GR HU IE IT LU MT NL NO PL PT SE SG TR)
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro]
+      self.supported_cardtypes = %i[visa master american_express discover jcb maestro]
 
       self.homepage_url = 'http://online.worldpay.com'
       self.display_name = 'Worldpay Online Payments'

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

@@ -15,7 +15,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
       self.default_currency = 'USD'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover jcb]
 
       def initialize(options={})
         requires!(options, :acctid, :subid, :merchantpin)

data/lib/active_merchant/connection.rb

@@ -73,52 +73,50 @@ module ActiveMerchant
       headers['connection'] ||= 'close'
 
       retry_exceptions(max_retries: max_retries, logger: logger, tag: tag) do
-        begin
-          info "connection_http_method=#{method.to_s.upcase} connection_uri=#{endpoint}", tag
-
-          result = nil
-
-          realtime = Benchmark.realtime do
-            http.start unless http.started?
-            @ssl_connection = http.ssl_connection
-            info "connection_ssl_version=#{ssl_connection[:version]} connection_ssl_cipher=#{ssl_connection[:cipher]}", tag
-
-            result =
-              case method
-              when :get
-                raise ArgumentError, 'GET requests do not support a request body' if body
-
-                http.get(endpoint.request_uri, headers)
-              when :post
+        info "connection_http_method=#{method.to_s.upcase} connection_uri=#{endpoint}", tag
+
+        result = nil
+
+        realtime = Benchmark.realtime do
+          http.start unless http.started?
+          @ssl_connection = http.ssl_connection
+          info "connection_ssl_version=#{ssl_connection[:version]} connection_ssl_cipher=#{ssl_connection[:cipher]}", tag
+
+          result =
+            case method
+            when :get
+              raise ArgumentError, 'GET requests do not support a request body' if body
+
+              http.get(endpoint.request_uri, headers)
+            when :post
+              debug body
+              http.post(endpoint.request_uri, body, RUBY_184_POST_HEADERS.merge(headers))
+            when :put
+              debug body
+              http.put(endpoint.request_uri, body, headers)
+            when :patch
+              debug body
+              http.patch(endpoint.request_uri, body, headers)
+            when :delete
+              # It's kind of ambiguous whether the RFC allows bodies
+              # for DELETE requests. But Net::HTTP's delete method
+              # very unambiguously does not.
+              if body
                 debug body
-                http.post(endpoint.request_uri, body, RUBY_184_POST_HEADERS.merge(headers))
-              when :put
-                debug body
-                http.put(endpoint.request_uri, body, headers)
-              when :patch
-                debug body
-                http.patch(endpoint.request_uri, body, headers)
-              when :delete
-                # It's kind of ambiguous whether the RFC allows bodies
-                # for DELETE requests. But Net::HTTP's delete method
-                # very unambiguously does not.
-                if body
-                  debug body
-                  req = Net::HTTP::Delete.new(endpoint.request_uri, headers)
-                  req.body = body
-                  http.request(req)
-                else
-                  http.delete(endpoint.request_uri, headers)
-                end
+                req = Net::HTTP::Delete.new(endpoint.request_uri, headers)
+                req.body = body
+                http.request(req)
               else
-                raise ArgumentError, "Unsupported request method #{method.to_s.upcase}"
+                http.delete(endpoint.request_uri, headers)
               end
-          end
-
-          info '--> %d %s (%d %.4fs)' % [result.code, result.message, result.body ? result.body.length : 0, realtime], tag
-          debug result.body
-          result
+            else
+              raise ArgumentError, "Unsupported request method #{method.to_s.upcase}"
+            end
         end
+
+        info '--> %d %s (%d %.4fs)' % [result.code, result.message, result.body ? result.body.length : 0, realtime], tag
+        debug result.body
+        result
       end
     ensure
       info 'connection_request_total_time=%.4fs' % [Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start], tag