activemerchant 1.110.0 → 1.116.0

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

@@ -83,7 +83,7 @@ module ActiveMerchant
         store: 'registerAccount'
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         @options = options
 
         @options[:merchant] ||= 'TEST' if test?
@@ -92,7 +92,7 @@ module ActiveMerchant
         @options[:eci] ||= 'SSL'
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         requires!(options, :order_id)
 
         post = {}
@@ -101,7 +101,7 @@ module ActiveMerchant
         commit(:authorize, post)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         requires!(options, :order_id)
 
         post = {}
@@ -110,7 +110,7 @@ module ActiveMerchant
         commit(:capture, post)
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         requires!(options, :order_id)
 
         post = {}
@@ -119,7 +119,7 @@ module ActiveMerchant
         commit(:purchase, post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         requires!(options, :order_id)
 
         post = {}
@@ -128,7 +128,7 @@ module ActiveMerchant
         commit(:refund, post)
       end
 
-      def store(credit_card, options={})
+      def store(credit_card, options = {})
         requires!(options, :billing_id)
 
         post = {}
@@ -137,7 +137,7 @@ module ActiveMerchant
         commit(:store, post)
       end
 
-      def status(options={})
+      def status(options = {})
         requires!(options, :order_id)
 
         commit(:status, 'customer.orderNumber' => options[:order_id])
@@ -194,8 +194,7 @@ module ActiveMerchant
 
         Response.new(success, message, params,
           test: (@options[:merchant].to_s == 'TEST'),
-          authorization: post[:order_number]
-        )
+          authorization: post[:order_number])
       rescue ActiveMerchant::ResponseError => e
         raise unless e.response.code == '403'
 

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

@@ -31,7 +31,7 @@ module ActiveMerchant
         'W' => '9-digit zip/postal code matches billing information, street address does not',
         'X' => 'Street address and 9-digit zip/postal code matches billing information',
         'Y' => 'Street address and 5-digit zip/postal code matches billing information',
-        'Z' => '5-digit zip/postal code matches billing information, street address does not',
+        'Z' => '5-digit zip/postal code matches billing information, street address does not'
       }
 
       AVS_ERRORS = %w(A E N R W Z)
@@ -182,8 +182,7 @@ module ActiveMerchant
           test: test?,
           authorization: response[:orderid],
           avs_result: { code: response[:avs_code] },
-          cvv_result: response[:cvvresp]
-        )
+          cvv_result: response[:cvvresp])
       end
 
       def parse(body)

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

@@ -133,12 +133,12 @@ module ActiveMerchant #:nodoc:
         '99' => 'Generic decline or unable to parse issuer response code'
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :cert_str)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         request = build_xml_request do |xml|
           add_invoice(xml, money, options)
           add_payment(xml, payment, options)
@@ -151,7 +151,7 @@ module ActiveMerchant #:nodoc:
         commit(request)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         request = build_xml_request do |xml|
           add_invoice(xml, money, options)
           add_payment(xml, payment, options)
@@ -164,7 +164,7 @@ module ActiveMerchant #:nodoc:
         commit(request)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         request = build_xml_request do |xml|
           add_invoice(xml, money, options)
           add_account(xml, options)
@@ -175,7 +175,7 @@ module ActiveMerchant #:nodoc:
         commit(request)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         request = build_xml_request do |xml|
           add_invoice(xml, money, options)
           add_account(xml, options)
@@ -186,11 +186,11 @@ module ActiveMerchant #:nodoc:
         commit(request)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         refund(nil, authorization, options)
       end
 
-      def credit(money, payment, options={})
+      def credit(money, payment, options = {})
         request = build_xml_request do |xml|
           add_invoice(xml, money, options)
           add_payment(xml, payment, options)
@@ -201,7 +201,7 @@ module ActiveMerchant #:nodoc:
         commit(request)
       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) }

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

@@ -106,8 +106,7 @@ module ActiveMerchant #:nodoc:
           test: test?,
           authorization: build_authorization(response),
           avs_result: { code: response[:avsresult] },
-          cvv_result: response[:cardidresult]
-        )
+          cvv_result: response[:cardidresult])
       end
 
       def url
@@ -119,7 +118,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(xml)
-        response = {message: 'Global Error Receipt', complete: false}
+        response = { message: 'Global Error Receipt', complete: false }
 
         xml = REXML::Document.new(xml)
         xml.elements.each('//Result/*') do |node|
@@ -163,7 +162,7 @@ module ActiveMerchant #:nodoc:
           SubTotal: amount(money),
           Tax1: options[:tax1],
           Tax2: options[:tax2],
-          ShippingTotal: options[:shipping_total],
+          ShippingTotal: options[:shipping_total]
         }
 
         if creditcard

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

@@ -263,8 +263,7 @@ module ActiveMerchant
           test: test?,
           authorization: response[:CrossReference],
           cvv_result: CVV_CODE[response[:AVSCV2Check]],
-          avs_result: { code: AVS_CODE[response[:AVSCV2Check]] }
-        )
+          avs_result: { code: AVS_CODE[response[:AVSCV2Check]] })
       end
 
       # Put the passed data into a format that can be submitted to PSL

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

@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
         purchase: 'CustomerCreditCardCharge',
         refund: 'CustomerCreditCardTxnVoidOrRefund',
         void: 'CustomerCreditCardTxnVoid',
-        query: 'MerchantAccountQuery',
+        query: 'MerchantAccountQuery'
       }
 
       # Creates a new QbmsGateway
@@ -147,8 +147,7 @@ module ActiveMerchant #:nodoc:
           authorization: response[:credit_card_trans_id],
           fraud_review: fraud_review?(response),
           avs_result: { code: avs_result(response) },
-          cvv_result: cvv_result(response)
-        )
+          cvv_result: cvv_result(response))
       end
 
       def success?(response)
@@ -168,7 +167,7 @@ module ActiveMerchant #:nodoc:
         if status_code != 0
           return {
             status_code: status_code,
-            status_message: signon.attributes['statusMessage'],
+            status_message: signon.attributes['statusMessage']
           }
         end
 
@@ -176,7 +175,7 @@ module ActiveMerchant #:nodoc:
 
         results = {
           status_code: response.attributes['statusCode'].to_i,
-          status_message: response.attributes['statusMessage'],
+          status_message: response.attributes['statusMessage']
         }
 
         response.elements.each do |e|

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

@@ -219,8 +219,7 @@ module ActiveMerchant #:nodoc:
           test: test?,
           authorization: authorization,
           avs_result: { code: response[:AVSResponseCode] },
-          cvv_result: response[:CVV2ResponseCode]
-        )
+          cvv_result: response[:CVV2ResponseCode])
       end
 
       # Parse the SOAP response

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

@@ -151,8 +151,9 @@ module ActiveMerchant #:nodoc:
         if address = options[:billing_address] || options[:address]
           card_address[:streetAddress] = address[:address1]
           card_address[:city] = address[:city]
-          card_address[:region] = address[:state] || address[:region]
-          card_address[:country] = address[:country]
+          region = address[:state] || address[:region]
+          card_address[:region] = region if region.present?
+          card_address[:country] = address[:country] if address[:country].present?
           card_address[:postalCode] = address[:zip] if address[:zip]
         end
         post[:card][:address] = card_address
@@ -259,7 +260,7 @@ module ActiveMerchant #:nodoc:
         hmac_signature = OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), oauth_signing_key, oauth_signature_base_string)
 
         # append signature to required OAuth parameters
-        oauth_parameters[:oauth_signature] = CGI.escape(Base64.encode64(hmac_signature).chomp.gsub(/\n/, ''))
+        oauth_parameters[:oauth_signature] = CGI.escape(Base64.encode64(hmac_signature).chomp.delete("\n"))
 
         # prepare Authorization header string
         oauth_parameters = Hash[oauth_parameters.sort_by { |k, _| k }]

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

@@ -68,7 +68,7 @@ module ActiveMerchant
         commit(synchronized_path("/payments/#{identification}/refund"), 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) }
@@ -155,8 +155,7 @@ module ActiveMerchant
 
         Response.new(success, message_from(success, response), response,
           test: test?,
-          authorization: authorization_from(response)
-        )
+          authorization: authorization_from(response))
       end
 
       def authorization_from(response)
@@ -264,7 +263,7 @@ module ActiveMerchant
       end
 
       def format_order_id(order_id)
-        truncate(order_id.to_s.gsub(/#/, ''), 20)
+        truncate(order_id.to_s.delete('#'), 20)
       end
 
       def headers

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

@@ -166,8 +166,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(successful?(response), message_from(response), response,
           test: test?,
-          authorization: response[:transaction]
-        )
+          authorization: response[:transaction])
       end
 
       def successful?(response)

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

@@ -16,12 +16,12 @@ module ActiveMerchant #:nodoc:
         'S' => 'D'
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :username, :password, :merchant, :pem, :pem_password)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_order_number(post, options)
@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
         commit('capture', post)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_order_number(post, options)
@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
         commit('preauth', post)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_reference(post, authorization, options)
@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         commit('captureWithoutAuth', post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_reference(post, authorization, options)
@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
       end
 
       # Credit requires the merchant account to be enabled for "Adhoc Refunds"
-      def credit(amount, payment_method, options={})
+      def credit(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_order_number(post, options)
@@ -80,7 +80,7 @@ module ActiveMerchant #:nodoc:
         commit('refund', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_reference(post, authorization, options)
         add_customer_data(post, options)
@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
+      CURRENCY_CODES = Hash.new { |_h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
       CURRENCY_CODES['AUD'] = 'AUD'
       CURRENCY_CODES['INR'] = 'INR'
 
@@ -280,7 +280,7 @@ module ActiveMerchant #:nodoc:
         '12' => STANDARD_ERROR_CODE[:card_declined],
         '06' => STANDARD_ERROR_CODE[:processing_error],
         '01' => STANDARD_ERROR_CODE[:call_issuer],
-        '04' => STANDARD_ERROR_CODE[:pickup_card],
+        '04' => STANDARD_ERROR_CODE[:pickup_card]
       }
 
       def error_code_from(succeeded, response)

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

@@ -300,7 +300,7 @@ module ActiveMerchant
         end
         xml.tag! 'supplementarydata' do
           xml.tag! 'item', 'type' => 'mobile' do
-            xml.tag! 'field01', payment.source.to_s.gsub('_', '-')
+            xml.tag! 'field01', payment.source.to_s.tr('_', '-')
           end
         end
       end
@@ -316,6 +316,7 @@ module ActiveMerchant
           else
             xml.tag! 'cavv', three_d_secure[:cavv]
             xml.tag! 'xid', three_d_secure[:xid]
+            version = '1'
           end
           xml.tag! 'eci', three_d_secure[:eci]
           xml.tag! 'message_version', version

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

@@ -322,7 +322,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_threeds(data, options)
-        data[:threeds] = {threeDSInfo: 'CardData'} if options[:execute_threed] == true
+        data[:threeds] = { threeDSInfo: 'CardData' } if options[:execute_threed] == true
       end
 
       def determine_3ds_action(threeds_hash)
@@ -334,7 +334,7 @@ module ActiveMerchant #:nodoc:
       def commit(data, options = {})
         if data[:threeds]
           action = determine_3ds_action(data[:threeds])
-          request = <<-EOS
+          request = <<-REQUEST
             <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.sis.sermepa.es" xmlns:intf="http://webservice.sis.sermepa.es" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
             <soapenv:Header/>
             <soapenv:Body>
@@ -345,14 +345,14 @@ module ActiveMerchant #:nodoc:
               </intf:#{action}>
             </soapenv:Body>
           </soapenv:Envelope>
-          EOS
+          REQUEST
           parse(ssl_post(threeds_url, request, headers(action)), action)
         else
           parse(ssl_post(url, "entrada=#{CGI.escape(xml_request_from(data, options))}", headers), action)
         end
       end
 
-      def headers(action=nil)
+      def headers(action = nil)
         if action
           {
             'Content-Type' => 'text/xml',
@@ -476,7 +476,7 @@ module ActiveMerchant #:nodoc:
           if validate_signature(params)
             message = response_text(params[:ds_response])
             options[:authorization] = build_authorization(params)
-            success = is_success_response?(params[:ds_response])
+            success = success_response?(params[:ds_response])
           else
             message = 'Response failed validation check'
           end
@@ -490,7 +490,7 @@ module ActiveMerchant #:nodoc:
           end
           message = response_text_3ds(xml, params)
           options[:authorization] = build_authorization(params)
-          success = params.size > 0 && is_success_response?(params[:ds_response])
+          success = params.size > 0 && success_response?(params[:ds_response])
         else
           # Some kind of programmer error with the request!
           message = "#{code} ERROR"
@@ -559,7 +559,7 @@ module ActiveMerchant #:nodoc:
         message
       end
 
-      def is_success_response?(code)
+      def success_response?(code)
         (code.to_i < 100) || [400, 481, 500, 900].include?(code.to_i)
       end