activemerchant 1.86.0 → 1.87.0

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

@@ -432,7 +432,7 @@ module ActiveMerchant #:nodoc:
       def validate_signature(data)
         if sha256_authentication?
           sig = Base64.strict_encode64(mac256(get_key(data[:ds_order].to_s), xml_signed_fields(data)))
-          sig.upcase == data[:ds_signature].to_s.upcase
+          sig.casecmp(data[:ds_signature].to_s).zero?
         else
           str = data[:ds_amount] +
             data[:ds_order].to_s +
@@ -523,7 +523,7 @@ module ActiveMerchant #:nodoc:
           xml_signed_fields += data[:ds_cardnumber]
         end
 
-        xml_signed_fields += data[:ds_transactiontype] + data[:ds_securepayment]
+        xml_signed_fields + data[:ds_transactiontype] + data[:ds_securepayment]
       end
 
       def get_key(order_id)

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

@@ -252,8 +252,8 @@ module ActiveMerchant #:nodoc:
 
       def underscore(camel_cased_word)
         camel_cased_word.to_s.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+          gsub(/([a-z\d])([A-Z])/, '\1_\2').
           tr('-', '_').
           downcase
       end

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

@@ -179,9 +179,9 @@ module ActiveMerchant #:nodoc:
 
       def parse_check(data)
         response = {}
-        response[:success]          = data[1,1]
-        response[:code]             = data[2,6].strip
-        response[:message]          = data[8,32].strip
+        response[:success]          = data[1, 1]
+        response[:code]             = data[2, 6].strip
+        response[:message]          = data[8, 32].strip
         response[:risk]             = data[40, 2]
         response[:reference]        = data[42, 10]
 
@@ -194,9 +194,9 @@ module ActiveMerchant #:nodoc:
 
       def parse_credit_card(data)
         response = {}
-        response[:success]          = data[1,1]
-        response[:code]             = data[2,6]
-        response[:message]          = data[8,32].strip
+        response[:success]          = data[1, 1]
+        response[:code]             = data[2, 6]
+        response[:message]          = data[8, 32].strip
         response[:front_end]        = data[40, 2]
         response[:cvv_result]       = data[42, 1]
         response[:avs_result]       = data[43, 1].strip

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

@@ -343,16 +343,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        response = parse( ssl_post(url_for(action), post_data(action, parameters)) )
+        response = parse(ssl_post(url_for(action), post_data(action, parameters)))
 
         Response.new(response['Status'] == APPROVED, message_from(response), response,
           :test => test?,
           :authorization => authorization_from(response, parameters, action),
           :avs_result => {
-            :street_match => AVS_CODE[ response['AddressResult'] ],
-            :postal_match => AVS_CODE[ response['PostCodeResult'] ],
+            :street_match => AVS_CODE[response['AddressResult']],
+            :postal_match => AVS_CODE[response['PostCodeResult']],
           },
-          :cvv_result => CVV_CODE[ response['CV2Result'] ]
+          :cvv_result => CVV_CODE[response['CV2Result']]
         )
       end
 
@@ -380,9 +380,9 @@ module ActiveMerchant #:nodoc:
 
       def build_url(action)
         endpoint = case action
-          when :purchase, :authorization then 'vspdirect-register'
-          when :store then 'directtoken'
-          else TRANSACTIONS[action].downcase
+        when :purchase, :authorization then 'vspdirect-register'
+        when :store then 'directtoken'
+        else TRANSACTIONS[action].downcase
         end
         "#{test? ? self.test_url : self.live_url}/#{endpoint}.vsp"
       end

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

@@ -247,7 +247,7 @@ module ActiveMerchant #:nodoc:
 
       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

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

@@ -183,9 +183,9 @@ module ActiveMerchant #:nodoc:
 
       def message_from(results)
         if results[:response_code] == DECLINED
-          return CVVResult.messages[ results[:card_code] ] if CARD_CODE_ERRORS.include?(results[:card_code])
+          return CVVResult.messages[results[:card_code]] if CARD_CODE_ERRORS.include?(results[:card_code])
           if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
-            return AVSResult.messages[ results[:avs_result_code] ]
+            return AVSResult.messages[results[:avs_result_code]]
           end
         end
 

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

@@ -276,7 +276,7 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|element| parse_element(response, element) }
+          node.elements.each { |element| parse_element(response, element) }
         else
           response[node.name.underscore.to_sym] = node.text
         end

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

@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, post)
-        response = parse( ssl_post(self.live_url, post_data(action, post) ) )
+        response = parse(ssl_post(self.live_url, post_data(action, post)))
 
         Response.new(response[:result_code] == 1, message_from(response), response,
           :test => test?,

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

@@ -1,4 +1,3 @@
-#!ruby19
 # encoding: utf-8
 
 module ActiveMerchant #:nodoc:
@@ -261,7 +260,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, money, parameters)
-        response = parse( ssl_post( url_for(action), post_data(action, money, parameters) ), action )
+        response = parse(ssl_post(url_for(action), post_data(action, money, parameters)), action)
 
         # Pass along the original transaction id in the case an update transaction
         Response.new(response[:success], message_from(response, action), response,
@@ -275,7 +274,7 @@ module ActiveMerchant #:nodoc:
       def url_for(action)
         result = test? ? self.test_url : self.live_url
         result += advanced? && action == :authorization ? ADVANCED_PATH : BASIC_PATH
-        result += "?#{ACTIONS[action]}"
+        result + "?#{ACTIONS[action]}"
       end
 
       def add_credentials(params, action)
@@ -354,8 +353,8 @@ module ActiveMerchant #:nodoc:
       def post_data(action, money, params = {})
         add_credentials(params, action)
         add_amount(params, action, money)
-        sorted_params = params.to_a.sort{|a,b| a.to_s <=> b.to_s}.reverse
-        sorted_params.collect { |key, value| "#{key.to_s}=#{CGI.escape(value.to_s)}" }.join('&')
+        sorted_params = params.to_a.sort_by(&:to_s).reverse
+        sorted_params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def add_transaction_id(post, transaction_id)
@@ -369,7 +368,7 @@ module ActiveMerchant #:nodoc:
         post[:OrderDescription] = options[:description]
 
         if order_items = options[:items]
-          post[:OrderString] = order_items.collect { |item| "#{item[:sku]}~#{item[:description].tr('~','-')}~#{item[:declared_value]}~#{item[:quantity]}~#{item[:taxable]}~~~~~~~~#{item[:tax_rate]}~||"}.join
+          post[:OrderString] = order_items.collect { |item| "#{item[:sku]}~#{item[:description].tr('~', '-')}~#{item[:declared_value]}~#{item[:quantity]}~#{item[:taxable]}~~~~~~~~#{item[:tax_rate]}~||" }.join
         else
           post[:OrderString] = '1~None~0.00~0~N~||'
         end

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

@@ -23,7 +23,7 @@ module ActiveMerchant #:nodoc:
       def authorize(money, creditcard, options = {})
         post = {}
         add_invoice(post, options)
-        add_payment_source(post, creditcard,options)
+        add_payment_source(post, creditcard, options)
         add_address(post, options[:billing_address] || options[:address])
         add_address(post, options[:shipping_address], 'shipping')
         add_customer_data(post, options)
@@ -65,7 +65,7 @@ module ActiveMerchant #:nodoc:
         add_payment_source(post, payment_source, options)
         add_address(post, options[:billing_address] || options[:address])
         add_customer_data(post, options)
-        add_sku(post,options)
+        add_sku(post, options)
         add_currency(post, money, options)
         add_processor(post, options)
         commit('credit', money, post)
@@ -138,7 +138,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_address(post, address,prefix='')
+      def add_address(post, address, prefix='')
         prefix +='_' unless prefix.blank?
         unless address.blank? or address.values.blank?
           post[prefix+'address1']    = address[:address1].to_s
@@ -206,7 +206,7 @@ module ActiveMerchant #:nodoc:
         post[:account_type] = check.account_type # The customer's type of ACH account
       end
 
-      def add_sku(post,options)
+      def add_sku(post, options)
         post['product_sku_#'] = options[:sku] || options['product_sku_#']
       end
 
@@ -221,7 +221,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
-          key,val = pair.split(/=/)
+          key, val = pair.split(/=/)
           results[key] = val
         end
 
@@ -230,7 +230,7 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, money, parameters)
         parameters[:amount]  = localized_amount(money, parameters[:currency] || default_currency) if money
-        response = parse( ssl_post(self.live_url, post_data(action,parameters)) )
+        response = parse(ssl_post(self.live_url, post_data(action, parameters)))
         Response.new(response['response'] == '1', message_from(response), response,
           :authorization => (response['transactionid'] || response['customer_vault_id']),
           :test => test?,
@@ -263,7 +263,7 @@ module ActiveMerchant #:nodoc:
         post[:password]   = @options[:password]
         post[:type]       = action if action
 
-        request = post.merge(parameters).map {|key,value| "#{key}=#{CGI.escape(value.to_s)}"}.join('&')
+        request = post.merge(parameters).map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
         request
       end
 

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

@@ -114,7 +114,7 @@ module ActiveMerchant #:nodoc:
       def fill_cardholder(soap, card, options)
         ch_info = options[:billing_address] || options[:address]
 
-        soap.tag!('customerIP',options[:ip].to_s)
+        soap.tag!('customerIP', options[:ip].to_s)
         name = card.name || ch_info[:name]
         soap.tag!('cardHolderName', name.to_s)
         address = ch_info[:address1] || ''

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

@@ -177,7 +177,7 @@ module ActiveMerchant #:nodoc:
 
         post = {}
         add_amount(post, money, options)
-        options.merge!(:key => @fee_refund_api_key) if @fee_refund_api_key
+        options[:key] = @fee_refund_api_key if @fee_refund_api_key
         options.delete(:stripe_account)
 
         refund_fee = commit(:post, "application_fees/#{CGI.escape(identification)}/refunds", post, options)
@@ -474,7 +474,7 @@ module ActiveMerchant #:nodoc:
 
       def add_flags(post, options)
         post[:uncaptured] = true if options[:uncaptured]
-        post[:recurring] = true if (options[:eci] == 'recurring' || options[:recurring])
+        post[:recurring] = true if options[:eci] == 'recurring' || options[:recurring]
       end
 
       def add_metadata(post, options = {})
@@ -491,7 +491,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def fetch_application_fee(identification, options = {})
-        options.merge!(:key => @fee_refund_api_key)
+        options[:key] = @fee_refund_api_key
 
         fetch_charge = commit(:get, "charges/#{CGI.escape(identification)}", nil, options)
         application_fee_response!(fetch_charge, "Application fee id could not be retrieved: #{fetch_charge.message}")
@@ -549,8 +549,8 @@ module ActiveMerchant #:nodoc:
           'X-Stripe-Client-User-Agent' => stripe_client_user_agent(options),
           'X-Stripe-Client-User-Metadata' => {:ip => options[:ip]}.to_json
         }
-        headers.merge!('Idempotency-Key' => idempotency_key) if idempotency_key
-        headers.merge!('Stripe-Account' => options[:stripe_account]) if options[:stripe_account]
+        headers['Idempotency-Key'] = idempotency_key if idempotency_key
+        headers['Stripe-Account'] = options[:stripe_account] if options[:stripe_account]
         headers
       end
 

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

@@ -117,8 +117,8 @@ module ActiveMerchant #:nodoc:
           rescue ResponseError => e
             build_error_response("ssl_post() with url #{url} raised ResponseError: #{e}")
           rescue JSON::ParserError => e
-            msg = 'Invalid response received from the Swipe Checkout API. ' +
-                  'Please contact support@optimizerhq.com if you continue to receive this message.' +
+            msg = 'Invalid response received from the Swipe Checkout API. ' \
+                  'Please contact support@optimizerhq.com if you continue to receive this message.' \
                   " (Full error message: #{e})"
             build_error_response(msg)
           end

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

@@ -215,7 +215,7 @@ module ActiveMerchant #:nodoc:
 
         doc = Nokogiri::XML(xml)
         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|

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

@@ -321,7 +321,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['USD'] = '840'
 
       def headers
@@ -539,7 +539,7 @@ module ActiveMerchant #:nodoc:
           if (billing_address = options[:billing_address])
             if billing_address[:phone]
               doc['v1'].phone do
-                doc['v1'].type (options[:phone_number_type] || '4')
+                doc['v1'].type(options[:phone_number_type] || '4')
                 doc['v1'].nr billing_address[:phone].gsub(/\D/, '')
               end
             end

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

@@ -32,7 +32,7 @@ module ActiveMerchant #:nodoc:
         post[:rs] = @options[:terminal]
 
         MultiResponse.run do |r|
-          r.process{commit('init', post)}
+          r.process { commit('init', post) }
           r.process do
             post = PostData.new
             post[:init_transaction_id] = r.authorization
@@ -54,7 +54,7 @@ module ActiveMerchant #:nodoc:
         post[:rs] = @options[:terminal]
 
         MultiResponse.run do |r|
-          r.process{commit('init_dms', post)}
+          r.process { commit('init_dms', post) }
           r.process do
             post = PostData.new
             post[:init_transaction_id] = r.authorization
@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         if body =~ /^ID:/
-          body.split('~').reduce(Hash.new) { |h,v|
+          body.split('~').reduce(Hash.new) { |h, v|
             m = v.match('(.*?):(.*)')
             h.merge!(m[1].underscore.to_sym => m[2])
           }
@@ -174,13 +174,13 @@ module ActiveMerchant #:nodoc:
             { status: 'success', id: m[2] } :
             { status: 'failure', message: m[2] }
         else
-          Hash[ status: body ]
+          Hash[status: body]
         end
       end
 
       def commit(action, parameters, amount=nil)
         url = (test? ? test_url : live_url)
-        response = parse(ssl_post(url, post_data(action,parameters)))
+        response = parse(ssl_post(url, post_data(action, parameters)))
 
         Response.new(
           success_from(response),

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'smart_ps.rb')
+require File.join(File.dirname(__FILE__), 'smart_ps.rb')
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:

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

@@ -237,7 +237,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, [:periodicity, :bimonthly, :monthly, :biweekly, :weekly, :yearly, :daily])
 
         cycle = case options[:periodicity]
         when :monthly
@@ -362,7 +362,7 @@ module ActiveMerchant #:nodoc:
         # TCLink wants us to send a hash with string keys, and activemerchant pushes everything around with
         # symbol keys. Before sending our input to TCLink, we convert all our keys to strings and dump the symbol keys.
         # We also remove any pairs with nil values, as these confuse TCLink.
-        parameters.keys.reverse.each do |key|
+        parameters.keys.reverse_each do |key|
           if parameters[key]
             parameters[key.to_s] = parameters[key]
           end
@@ -371,7 +371,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(parameters)
-        parameters.collect { |key, value| "#{key}=#{ CGI.escape(value.to_s)}" }.join('&')
+        parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def commit(action, parameters)
@@ -383,9 +383,9 @@ module ActiveMerchant #:nodoc:
         clean_and_stringify_params(parameters)
 
         data = if tclink?
-          TCLink.send(parameters)
-        else
-          parse( ssl_post(self.live_url, post_data(parameters)) )
+                 TCLink.send(parameters)
+               else
+                 parse(ssl_post(self.live_url, post_data(parameters)))
         end
 
         # to be considered successful, transaction status must be either "approved" or "accepted"
@@ -403,7 +403,7 @@ module ActiveMerchant #:nodoc:
         results = {}
 
         body.split(/\n/).each do |pair|
-          key,val = pair.split(/=/)
+          key, val = pair.split(/=/)
           results[key] = val
         end
 

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

@@ -272,8 +272,8 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login, :password)
 
         if options[:software_id]
-          self.live_url = "#{LIVE_URL_BASE}#{options[:software_id].to_s}"
-          self.test_url = "#{TEST_URL_BASE}#{options[:software_id].to_s}"
+          self.live_url = "#{LIVE_URL_BASE}#{options[:software_id]}"
+          self.test_url = "#{TEST_URL_BASE}#{options[:software_id]}"
         else
           self.live_url = options[:live_url].to_s
           self.test_url = options[:test_url].to_s if options[:test_url]
@@ -1297,7 +1297,7 @@ module ActiveMerchant #:nodoc:
 
       def build_customer_data(soap, options)
         soap.CustomerData 'xsi:type' => 'ns1:CustomerObject' do
-          CUSTOMER_OPTIONS.each do |k,v|
+          CUSTOMER_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], options[k]
           end
           build_billing_address soap, options
@@ -1370,7 +1370,7 @@ module ActiveMerchant #:nodoc:
       def build_customer_transaction(soap, options)
         soap.Parameters 'xsi:type' => 'ns1:CustomerTransactionRequest' do
           build_transaction_detail soap, options
-          CUSTOMER_TRANSACTION_REQUEST_OPTIONS.each do |k,v|
+          CUSTOMER_TRANSACTION_REQUEST_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], options[k]
           end
           build_custom_fields soap, options
@@ -1382,11 +1382,12 @@ module ActiveMerchant #:nodoc:
 
       def build_transaction_request_object(soap, options, name='Params')
         soap.tag! name, 'xsi:type' => 'ns1:TransactionRequestObject' do
-          TRANSACTION_REQUEST_OBJECT_OPTIONS.each do |k,v|
+          TRANSACTION_REQUEST_OBJECT_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], options[k]
           end
           case
-          when options[:payment_method] == nil
+          when options[:payment_method].nil?
+            nil
           when options[:payment_method].kind_of?(ActiveMerchant::Billing::CreditCard)
             build_credit_card_data soap, options
           when options[:payment_method].kind_of?(ActiveMerchant::Billing::Check)
@@ -1405,10 +1406,10 @@ module ActiveMerchant #:nodoc:
 
       def build_transaction_detail(soap, options)
         soap.Details 'xsi:type' => 'ns1:TransactionDetail' do
-          TRANSACTION_DETAIL_OPTIONS.each do |k,v|
+          TRANSACTION_DETAIL_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], options[k]
           end
-          TRANSACTION_DETAIL_MONEY_OPTIONS.each do |k,v|
+          TRANSACTION_DETAIL_MONEY_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], amount(options[k])
           end
         end
@@ -1424,7 +1425,7 @@ module ActiveMerchant #:nodoc:
           end
           build_tag soap, :string, 'CardCode', options[:payment_method].verification_value
           build_tag soap, :boolean, 'CardPresent', options[:card_present] || false
-          CREDIT_CARD_DATA_OPTIONS.each do |k,v|
+          CREDIT_CARD_DATA_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], options[k]
           end
         end
@@ -1444,7 +1445,7 @@ module ActiveMerchant #:nodoc:
           build_tag soap, :string, 'Account', options[:payment_method].account_number
           build_tag soap, :string, 'Routing', options[:payment_method].routing_number
           build_tag soap, :string, 'AccountType', options[:payment_method].account_type.capitalize
-          CHECK_DATA_OPTIONS.each do |k,v|
+          CHECK_DATA_OPTIONS.each do |k, v|
             build_tag soap, v[0], v[1], options[k]
           end
         end
@@ -1456,7 +1457,7 @@ module ActiveMerchant #:nodoc:
             build_tag soap, :double, 'Amount', amount(options[:recurring][:amount])
             build_tag soap, :string, 'Next', options[:recurring][:next].strftime('%Y-%m-%d') if options[:recurring][:next]
             build_tag soap, :string, 'Expire', options[:recurring][:expire].strftime('%Y-%m-%d') if options[:recurring][:expire]
-            RECURRING_BILLING_OPTIONS.each do |k,v|
+            RECURRING_BILLING_OPTIONS.each do |k, v|
               build_tag soap, v[0], v[1], options[:recurring][k]
             end
           end
@@ -1479,7 +1480,7 @@ module ActiveMerchant #:nodoc:
             options[:billing_address][:first_name], options[:billing_address][:last_name] = split_names(options[:billing_address][:name])
           end
           soap.BillingAddress 'xsi:type' => 'ns1:Address' do
-            ADDRESS_OPTIONS.each do |k,v|
+            ADDRESS_OPTIONS.each do |k, v|
               build_tag soap, v[0], v[1], options[:billing_address][k]
             end
           end
@@ -1492,7 +1493,7 @@ module ActiveMerchant #:nodoc:
             options[:shipping_address][:first_name], options[:shipping_address][:last_name] = split_names(options[:shipping_address][:name])
           end
           soap.ShippingAddress 'xsi:type' => 'ns1:Address' do
-            ADDRESS_OPTIONS.each do |k,v|
+            ADDRESS_OPTIONS.each do |k, v|
               build_tag soap, v[0], v[1], options[:shipping_address][k]
             end
           end
@@ -1502,7 +1503,7 @@ module ActiveMerchant #:nodoc:
       def build_field_value_array(soap, tag_name, type, custom_data, fields)
         soap.tag! tag_name, 'SOAP-ENC:arryType' => "xsd:#{type}[#{options.length}]", 'xsi:type' => "ns1:#{type}Array" do
           custom_data.each do |k, v|
-            build_field_value soap, fields[k][1], v, fields[k][0] if fields.keys.include? k
+            build_field_value soap, fields[k][1], v, fields[k][0] if fields.key?(k)
           end
         end
       end
@@ -1537,7 +1538,7 @@ module ActiveMerchant #:nodoc:
       def build_response(action, soap)
         response_params, success, message, authorization, avs, cvv = parse(action, soap)
 
-        response_params.merge!('soap_response' => soap) if @options[:soap_response]
+        response_params['soap_response'] = soap if @options[:soap_response]
 
         Response.new(
           success,
@@ -1552,7 +1553,7 @@ module ActiveMerchant #:nodoc:
 
       def avs_from(avs)
         avs_params = { :code => avs }
-        avs_params.merge!(:message => AVS_CUSTOM_MESSAGES[avs]) if AVS_CUSTOM_MESSAGES.key?(avs)
+        avs_params[:message] = AVS_CUSTOM_MESSAGES[avs] if AVS_CUSTOM_MESSAGES.key?(avs)
         avs_params
       end