activemerchant 1.86.0 → 1.87.0

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

@@ -186,7 +186,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
-          key,val = pair.split(/\=/)
+          key, val = pair.split(/\=/)
           results[key.to_sym] = CGI.unescape(val)
         end
         results
@@ -224,7 +224,7 @@ module ActiveMerchant #:nodoc:
         parameters[:pay_type] = 'C'
         parameters[:tran_type] = TRANSACTIONS[action]
 
-        parameters.reject{|k,v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
+        parameters.reject { |k, v| v.blank? }.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
     end

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

@@ -190,7 +190,7 @@ module ActiveMerchant #:nodoc:
         add_login_data(parameters)
         add_action(parameters, action, options)
 
-        post = parameters.collect{|key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
+        post = parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
         parse(ssl_post(url, post), parameters)
       end
 

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

@@ -246,7 +246,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(action, params)
-        params.map {|k, v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+        params.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def url
@@ -254,7 +254,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[CGI::parse(body).map { |k,v| [k.intern, v.first] }]
+        Hash[CGI::parse(body).map { |k, v| [k.intern, v.first] }]
       end
 
       def success_from(response)

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

@@ -149,7 +149,7 @@ module ActiveMerchant #:nodoc:
       # Verify and reserve the specified amount on the account, without actually doing the transaction.
       def authorize(money, payment_source, options = {})
         post = {}
-        action = (payment_source.brand == 'mastercard') ? 'PAU' : 'RES'
+        action = payment_source.brand == 'mastercard' ? 'PAU' : 'RES'
         add_invoice(post, options)
         add_payment_source(post, payment_source, options)
         add_address(post, payment_source, options)
@@ -213,7 +213,7 @@ module ActiveMerchant #:nodoc:
 
       # Store a credit card by creating an Ogone Alias
       def store(payment_source, options = {})
-        options.merge!(:alias_operation => 'BYPSP') unless(options.has_key?(:billing_id) || options.has_key?(:store))
+        options[:alias_operation] = 'BYPSP' unless(options.has_key?(:billing_id) || options.has_key?(:store))
         response = authorize(@options[:store_amount] || 1, payment_source, options)
         void(response.authorization) if response.success?
         response
@@ -301,8 +301,8 @@ module ActiveMerchant #:nodoc:
         add_pair post, 'ECI', eci.to_s
       end
 
-      def add_alias(post, _alias, alias_operation = nil)
-        add_pair post, 'ALIAS', _alias
+      def add_alias(post, alias_name, alias_operation = nil)
+        add_pair post, 'ALIAS', alias_name
         add_pair post, 'ALIASOPERATION', alias_operation unless alias_operation.nil?
       end
 
@@ -429,9 +429,9 @@ module ActiveMerchant #:nodoc:
           raise "Unknown signature algorithm #{algorithm}"
         end
 
-        filtered_params = signed_parameters.select{|k,v| !v.blank?}
+        filtered_params = signed_parameters.select { |k, v| !v.blank? }
         sha_encryptor.hexdigest(
-          filtered_params.sort_by{|k,v| k.upcase}.map{|k, v| "#{k.upcase}=#{v}#{secret}"}.join('')
+          filtered_params.sort_by { |k, v| k.upcase }.map { |k, v| "#{k.upcase}=#{v}#{secret}" }.join('')
         ).upcase
       end
 
@@ -446,7 +446,7 @@ module ActiveMerchant #:nodoc:
               PSPID
               Operation
               ALIAS
-            ).map{|key| parameters[key]} +
+            ).map { |key| parameters[key] } +
             [secret]
           ).join('')
         ).upcase

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

@@ -164,7 +164,7 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(/(Authorization: Basic )\w+/i, '\1[FILTERED]').
           gsub(/(\\"number\\":)\\"\d+\\"/, '\1[FILTERED]').
-          gsub(/(\\"security_code\\":)\\"\d+\\"/,'\1[FILTERED]')
+          gsub(/(\\"security_code\\":)\\"\d+\\"/, '\1[FILTERED]')
       end
 
       private
@@ -246,15 +246,15 @@ module ActiveMerchant #:nodoc:
       def message_to_standard_error_code_from(response)
         message = response['message'] if response['code'] == 'invalid_card'
         case message
-          when /brand not supported/
+        when /brand not supported/
             STANDARD_ERROR_CODE[:invalid_number]
-          when /number is invalid/
+        when /number is invalid/
             STANDARD_ERROR_CODE[:incorrect_number]
-          when /expiration date cannot be in the past/
+        when /expiration date cannot be in the past/
             STANDARD_ERROR_CODE[:expired_card]
-          when /expiration \w+ is invalid/
+        when /expiration \w+ is invalid/
             STANDARD_ERROR_CODE[:invalid_expiry_date]
-          else
+        else
             STANDARD_ERROR_CODE[:processing_error]
         end
       end

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

@@ -272,7 +272,7 @@ module ActiveMerchant #:nodoc:
       def add_options(post, options)
         post[:createRegistration] = options[:create_registration] if options[:create_registration] && !options[:registrationId]
         post[:testMode] = options[:test_mode] if test? && options[:test_mode]
-        options.each {|key, value| post[key] = value if key.to_s.match('customParameters\[[a-zA-Z0-9\._]{3,64}\]') }
+        options.each { |key, value| post[key] = value if key.to_s.match('customParameters\[[a-zA-Z0-9\._]{3,64}\]') }
         post['customParameters[SHOPPER_pluginId]'] = 'activemerchant'
         post['customParameters[custom_disable3DSecure]'] = options[:disable_3d_secure] if options[:disable_3d_secure]
       end

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

@@ -60,6 +60,11 @@ module ActiveMerchant #:nodoc:
         commit('ccSettlement', money, options)
       end
 
+      def verify(credit_card, options = {})
+        parse_card_or_auth(credit_card, options)
+        commit('ccVerification', 0, options)
+      end
+
       def supports_scrubbing?
         true
       end

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

@@ -273,13 +273,13 @@ module ActiveMerchant #:nodoc:
       #   'MS'  - Manual Suspend
 
       def add_customer_profile(creditcard, options = {})
-        options.merge!(:customer_profile_action => CREATE)
+        options[:customer_profile_action] = CREATE
         order = build_customer_request_xml(creditcard, options)
         commit(order, :add_customer_profile)
       end
 
       def update_customer_profile(creditcard, options = {})
-        options.merge!(:customer_profile_action => UPDATE)
+        options[:customer_profile_action] = UPDATE
         order = build_customer_request_xml(creditcard, options)
         commit(order, :update_customer_profile)
       end
@@ -516,12 +516,12 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        response.delete_if { |k,_| SENSITIVE_FIELDS.include?(k) }
+        response.delete_if { |k, _| SENSITIVE_FIELDS.include?(k) }
       end
 
       def recurring_parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|e| recurring_parse_element(response, e) }
+          node.elements.each { |e| recurring_parse_element(response, e) }
         else
           response[node.name.underscore.to_sym] = node.text
         end
@@ -529,9 +529,11 @@ module ActiveMerchant #:nodoc:
 
       def commit(order, message_type, trace_number=nil)
         headers = POST_HEADERS.merge('Content-length' => order.size.to_s)
-        headers.merge!( 'Trace-number' => trace_number.to_s,
-                        'Merchant-Id' => @options[:merchant_id] ) if @options[:retry_logic] && trace_number
-        request = lambda{|url| parse(ssl_post(url, order, headers))}
+        if @options[:retry_logic] && trace_number
+          headers['Trace-number'] = trace_number.to_s
+          headers['Merchant-Id'] = @options[:merchant_id]
+        end
+        request = ->(url) { parse(ssl_post(url, order, headers)) }
 
         # Failover URL will be attempted in the event of a connection error
         response = begin

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

@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[body.split('&').map{|x| x.split('=').map{|y| CGI.unescape(y)}}]
+        Hash[body.split('&').map { |x| x.split('=').map { |y| CGI.unescape(y) } }]
       end
 
       def commit(action, money, parameters)
@@ -193,11 +193,11 @@ module ActiveMerchant #:nodoc:
 
       def signature(action, post, parameters = {})
         string = if %w(cc_settle cc_debit cc_preauth cc_refund).include?(action)
-          post['UserName'] + post['Timestamp'] + post['RequestID'] + post['PymtType'] + parameters['Amount'].to_s + parameters['Currency']
-        elsif action == 'void'
-          post['UserName'] + post['Timestamp'] + post['RequestID'] + parameters['TrackingNumber']
-        else
-          post['UserName']
+                   post['UserName'] + post['Timestamp'] + post['RequestID'] + post['PymtType'] + parameters['Amount'].to_s + parameters['Currency']
+                 elsif action == 'void'
+                   post['UserName'] + post['Timestamp'] + post['RequestID'] + parameters['TrackingNumber']
+                 else
+                   post['UserName']
         end
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new(@options[:secret]), @options[:secret], string)
       end

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

@@ -230,7 +230,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def test?()
+      def test?
         @api_key.start_with?('ak_test')
       end
 

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

@@ -231,7 +231,7 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, params)
         params[:transaction_type] = action
-        params.map {|k, v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+        params.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def unparsable_response(raw_response)

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

@@ -162,29 +162,32 @@ module ActiveMerchant #:nodoc:
 
       def purchase(money, creditcard, options = {})
         MultiResponse.run do |r|
-          r.process{authorize(money, creditcard, options)}
-          r.process{capture(money, r.authorization, options)}
+          r.process { authorize(money, creditcard, options) }
+          r.process { capture(money, r.authorization, options) }
         end
       end
 
       def authorize(money, creditcard, options = {})
         action = 'authtx'
 
-        options.merge!(:money => money, :creditcard => creditcard)
+        options[:money] = money
+        options[:creditcard] = creditcard
         commit(action, build_request(action, options))
       end
 
       def capture(money, authorization, options = {})
         action = 'settletx'
 
-        options.merge!(:money => money, :authorization => authorization)
+        options[:money] = money
+        options[:authorization] = authorization
         commit(action, build_request(action, options), authorization)
       end
 
       def refund(money, authorization, options={})
         action = 'refundtx'
 
-        options.merge!(:money => money, :authorization => authorization)
+        options[:money] = money
+        options[:authorization] = authorization
         commit(action, build_request(action, options))
       end
 

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

@@ -171,7 +171,7 @@ module ActiveMerchant #:nodoc:
         success = false
 
         begin
-          raw_response = ssl_post(live_url, post.to_json, {'Content-Type' => 'application/json'} )
+          raw_response = ssl_post(live_url, post.to_json, {'Content-Type' => 'application/json'})
           response = parse(raw_response)
           success = (response['RESPONSE_CODE'] == '00')
         rescue ResponseError => e
@@ -200,7 +200,7 @@ module ActiveMerchant #:nodoc:
 
       def json_error(raw_response)
         {
-          error_message: 'Invalid response received from the Payhub API.  Please contact wecare@payhub.com if you continue to receive this message.' +
+          error_message: 'Invalid response received from the Payhub API.  Please contact wecare@payhub.com if you continue to receive this message.' \
             "  (The raw response returned by the API was #{raw_response.inspect})"
         }
       end

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

@@ -334,7 +334,7 @@ module ActiveMerchant #:nodoc:
       def commit(action, parameters)
         url = test? ? self.test_url : self.live_url
 
-        response = parse( ssl_post(url, post_data(action, parameters)) )
+        response = parse(ssl_post(url, post_data(action, parameters)))
 
         Response.new(successful?(response), message_from(response), response,
           :test => test?,
@@ -366,7 +366,7 @@ module ActiveMerchant #:nodoc:
         params[:version] = API_VERSION
         params[:transaction_type] = action
 
-        params.reject{|k,v| v.blank?}.collect{ |k, v| "dc_#{k.to_s}=#{CGI.escape(v.to_s)}" }.join('&')
+        params.reject { |k, v| v.blank? }.collect { |k, v| "dc_#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def parse(body)

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

@@ -146,7 +146,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(params)
-        params.map {|k, v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+        params.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def url(params={})
@@ -173,7 +173,7 @@ module ActiveMerchant #:nodoc:
       def message_from(response)
         return response['response']['message'] if response['response']
 
-        response['errors']&.inject(''){ |message,error| error['message'] + '|' + message }
+        response['errors']&.inject('') { |message, error| error['message'] + '|' + message }
       end
 
       def authorization_from(response)

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

@@ -52,7 +52,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, options)
-        post[:merchant_transid] = options[:order_id].to_s.slice(0,21)
+        post[:merchant_transid] = options[:order_id].to_s.slice(0, 21)
         post[:memnum]           = options[:invoice]
         post[:custnum]          = options[:customer]
         post[:clientdata]       = options[:description]
@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, money, parameters)
-        response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
+        response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
         Response.new(successful?(response), message_from(response), response,
           :test => test_response?(response),
@@ -104,7 +104,7 @@ module ActiveMerchant #:nodoc:
         parameters[:merchant_id]      = @options[:login]
         parameters[:password]         = @options[:password]
 
-        parameters.reject{|k,v| v.blank?}.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')
+        parameters.reject { |k, v| v.blank? }.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -86,8 +86,8 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, options)
         add_amount(post, money, options)
-        post[:numappel] = authorization[0,10]
-        post[:numtrans] = authorization[10,10]
+        post[:numappel] = authorization[0, 10]
+        post[:numtrans] = authorization[10, 10]
 
         commit('capture', money, post)
       end
@@ -130,8 +130,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, identification)
-        post[:numappel] = identification[0,10]
-        post[:numtrans] = identification[10,10]
+        post[:numappel] = identification[0, 10]
+        post[:numtrans] = identification[10, 10]
       end
 
       def add_amount(post, money, options)
@@ -142,14 +142,14 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
-          key,val = pair.split(/\=/)
+          key, val = pair.split(/\=/)
           results[key.downcase.to_sym] = CGI.unescape(val) if val
         end
         results
       end
 
       def commit(action, money = nil, parameters = nil)
-        request_data = post_data(action,parameters)
+        request_data = post_data(action, parameters)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, request_data))
         response = parse(ssl_post(self.live_url_backup, request_data)) if service_unavailable?(response) && !test?
         Response.new(success?(response), message_from(response), response.merge(
@@ -157,7 +157,7 @@ module ActiveMerchant #:nodoc:
           :test => test?,
           :authorization => response[:numappel].to_s + response[:numtrans].to_s,
           :fraud_review => false,
-          :sent_params => parameters.delete_if{|key,value| ['porteur','dateval','cvv'].include?(key.to_s)}
+          :sent_params => parameters.delete_if { |key, value| ['porteur', 'dateval', 'cvv'].include?(key.to_s) }
         )
       end
 
@@ -179,7 +179,7 @@ module ActiveMerchant #:nodoc:
           :type => TRANSACTIONS[action.to_sym],
           :dateq => Time.now.strftime('%d%m%Y%H%M%S'),
           :numquestion => unique_id(parameters[:order_id]),
-          :site => @options[:login].to_s[0,7],
+          :site => @options[:login].to_s[0, 7],
           :rang => @options[:rang] || @options[:login].to_s[7..-1],
           :cle => @options[:password],
           :pays => '',

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

@@ -135,7 +135,7 @@ module ActiveMerchant
 
       def add_authorization_info(params, authorization, options = {})
         transaction_id, transaction_tag, method, _ = authorization.split('|')
-        params[:method] = (method == 'token') ? 'credit_card' : method
+        params[:method] = method == 'token' ? 'credit_card' : method
 
         if options[:reversal_id]
           params[:reversal_id] = options[:reversal_id]

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

@@ -63,8 +63,8 @@ module ActiveMerchant #:nodoc:
         if payment_method.respond_to?(:number)
           # credit card authorization
           MultiResponse.new.tap do |r|
-            r.process {send_initialize(amount, true, options)}
-            r.process {send_purchasecc(payment_method, r.params['orderref'])}
+            r.process { send_initialize(amount, true, options) }
+            r.process { send_purchasecc(payment_method, r.params['orderref']) }
           end
         else
           # stored authorization
@@ -91,8 +91,8 @@ module ActiveMerchant #:nodoc:
         if payment_method.respond_to?(:number)
           # credit card purchase
           MultiResponse.new.tap do |r|
-            r.process {send_initialize(amount, false, options)}
-            r.process {send_purchasecc(payment_method, r.params['orderref'])}
+            r.process { send_initialize(amount, false, options) }
+            r.process { send_purchasecc(payment_method, r.params['orderref']) }
           end
         else
           # stored purchase
@@ -154,10 +154,10 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
         amount = amount(1) # 1 cent for authorization
         MultiResponse.run(:first) do |r|
-          r.process {send_create_agreement(options)}
-          r.process {send_initialize(amount, true, options.merge({agreement_ref: r.authorization}))}
+          r.process { send_create_agreement(options) }
+          r.process { send_initialize(amount, true, options.merge({agreement_ref: r.authorization})) }
           order_ref = r.params['orderref']
-          r.process {send_purchasecc(creditcard, order_ref)}
+          r.process { send_purchasecc(creditcard, order_ref) }
         end
       end
 
@@ -364,7 +364,7 @@ module ActiveMerchant #:nodoc:
         doc = Nokogiri::XML(body)
 
         doc.root&.xpath('*')&.each do |node|
-          if (node.elements.size == 0)
+          if node.elements.size == 0
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|