activemerchant 1.86.0 → 1.87.0

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

@@ -33,7 +33,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, creditcard, options)
         add_customer_data(post, options)
 
@@ -136,11 +136,11 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_customer_vault_id(params,vault_id)
+      def add_customer_vault_id(params, vault_id)
         params[:customer_vault_id] = vault_id
       end
 
-      def add_creditcard(post, creditcard,options)
+      def add_creditcard(post, creditcard, options)
         if options[:store]
           post[:customer_vault] = 'add_customer'
           post[:customer_vault_id] = options[:store] unless options[:store] == true
@@ -164,7 +164,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
-          key,val = pair.split(%r{=})
+          key, val = pair.split(%r{=})
           results[key] = val
         end
 
@@ -174,7 +174,7 @@ module ActiveMerchant #:nodoc:
       def commit(action, money, parameters)
         parameters[:amount]  = amount(money) 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'],
@@ -186,7 +186,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(response)
         case response['responsetext']
-        when 'SUCCESS','Approved'
+        when 'SUCCESS', 'Approved'
           'This transaction has been approved'
         when 'DECLINE'
           'This transaction has been declined'
@@ -201,7 +201,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/iridium.rb

@@ -278,7 +278,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def build_purchase_request(type, money, creditcard, options)
-        options.merge!(:action => 'CardDetailsTransaction')
+        options[:action] = 'CardDetailsTransaction'
         build_request(options) do |xml|
           add_purchase_data(xml, type, money, options)
           add_creditcard(xml, creditcard)
@@ -287,7 +287,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_reference_request(type, money, authorization, options)
-        options.merge!(:action => 'CrossReferenceTransaction')
+        options[:action] = 'CrossReferenceTransaction'
         order_id, cross_reference, _ = authorization.split(';')
         build_request(options) do |xml|
           if money
@@ -419,39 +419,39 @@ module ActiveMerchant #:nodoc:
         case node.name
         when 'CrossReferenceTransactionResult'
           reply[:transaction_result] = {}
-          node.attributes.each do |a,b|
+          node.attributes.each do |a, b|
             reply[:transaction_result][a.underscore.to_sym] = b
           end
-          node.elements.each{|e| parse_element(reply[:transaction_result], e) } if node.has_elements?
+          node.elements.each { |e| parse_element(reply[:transaction_result], e) } if node.has_elements?
 
         when 'CardDetailsTransactionResult'
           reply[:transaction_result] = {}
-          node.attributes.each do |a,b|
+          node.attributes.each do |a, b|
             reply[:transaction_result][a.underscore.to_sym] = b
           end
-          node.elements.each{|e| parse_element(reply[:transaction_result], e) } if node.has_elements?
+          node.elements.each { |e| parse_element(reply[:transaction_result], e) } if node.has_elements?
 
         when 'TransactionOutputData'
           reply[:transaction_output_data] = {}
-          node.attributes.each{|a,b| reply[:transaction_output_data][a.underscore.to_sym] = b }
-          node.elements.each{|e| parse_element(reply[:transaction_output_data], e) } if node.has_elements?
+          node.attributes.each { |a, b| reply[:transaction_output_data][a.underscore.to_sym] = b }
+          node.elements.each { |e| parse_element(reply[:transaction_output_data], e) } if node.has_elements?
         when 'CustomVariables'
           reply[:custom_variables] = {}
-          node.attributes.each{|a,b| reply[:custom_variables][a.underscore.to_sym] = b }
-          node.elements.each{|e| parse_element(reply[:custom_variables], e) } if node.has_elements?
+          node.attributes.each { |a, b| reply[:custom_variables][a.underscore.to_sym] = b }
+          node.elements.each { |e| parse_element(reply[:custom_variables], e) } if node.has_elements?
         when 'GatewayEntryPoints'
           reply[:gateway_entry_points] = {}
-          node.attributes.each{|a,b| reply[:gateway_entry_points][a.underscore.to_sym] = b }
-          node.elements.each{|e| parse_element(reply[:gateway_entry_points], e) } if node.has_elements?
+          node.attributes.each { |a, b| reply[:gateway_entry_points][a.underscore.to_sym] = b }
+          node.elements.each { |e| parse_element(reply[:gateway_entry_points], e) } if node.has_elements?
         else
           k = node.name.underscore.to_sym
           if node.has_elements?
             reply[k] = {}
-            node.elements.each{|e| parse_element(reply[k], e) }
+            node.elements.each { |e| parse_element(reply[k], e) }
           else
             if node.has_attributes?
               reply[k] = {}
-              node.attributes.each{|a,b| reply[k][a.underscore.to_sym] = b }
+              node.attributes.each { |a, b| reply[k][a.underscore.to_sym] = b }
             else
               reply[k] = node.text
             end

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

@@ -302,7 +302,7 @@ module ActiveMerchant #:nodoc:
         xml.AuthCode options[:force] if options[:force]
         if options[:order_items].blank?
           xml.Total(amount(money)) unless(money.nil? || money < 0.01)
-          xml.Description(options[:description]) unless( options[:description].blank?)
+          xml.Description(options[:description]) unless(options[:description].blank?)
         else
           xml.OrderItems {
             options[:order_items].each do |item|
@@ -336,7 +336,7 @@ module ActiveMerchant #:nodoc:
         xml.AccountInfo {
           xml.CardAccount {
             xml.AccountNumber(creditcard.number.to_s)
-            xml.ExpirationMonth(creditcard.month.to_s.rjust(2,'0'))
+            xml.ExpirationMonth(creditcard.month.to_s.rjust(2, '0'))
             xml.ExpirationYear(creditcard.year.to_s)
             xml.CVVNumber(creditcard.verification_value.to_s) unless creditcard.verification_value.blank?
           }
@@ -372,7 +372,7 @@ module ActiveMerchant #:nodoc:
       def add_vendor_data(xml, options)
         return if options[:vendor_data].blank?
         xml.VendorData {
-          options[:vendor_data].each do |k,v|
+          options[:vendor_data].each do |k, v|
             xml.Element {
               xml.Name(k)
               xml.Key(v)
@@ -424,7 +424,7 @@ module ActiveMerchant #:nodoc:
 
       def successful?(response)
         # Turns out the PaymentClearing gateway is not consistent...
-        response[:status].downcase =='ok'
+        response[:status].casecmp('ok').zero?
       end
 
       def test_mode?(response)

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

@@ -206,7 +206,7 @@ module ActiveMerchant #:nodoc:
         end
 
         if !node.elements.empty?
-          node.elements.each {|e| parse_element(parsed, e) }
+          node.elements.each { |e| parse_element(parsed, e) }
         else
           parsed[underscore(node.name)] = node.text
         end
@@ -241,8 +241,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/jetpay.rb

@@ -315,7 +315,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
@@ -344,7 +344,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'CardExpYear', format_exp(credit_card.year)
 
         if credit_card.first_name || credit_card.last_name
-          xml.tag! 'CardName', [credit_card.first_name,credit_card.last_name].compact.join(' ')
+          xml.tag! 'CardName', [credit_card.first_name, credit_card.last_name].compact.join(' ')
         end
 
         unless credit_card.verification_value.nil? || (credit_card.verification_value.length == 0)

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

@@ -324,7 +324,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
@@ -369,7 +369,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'CardExpYear', format_exp(credit_card.year)
 
         if credit_card.first_name || credit_card.last_name
-          xml.tag! 'CardName', [credit_card.first_name,credit_card.last_name].compact.join(' ')
+          xml.tag! 'CardName', [credit_card.first_name, credit_card.last_name].compact.join(' ')
         end
 
         unless credit_card.verification_value.nil? || (credit_card.verification_value.length == 0)

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

@@ -153,7 +153,7 @@ module ActiveMerchant #:nodoc:
         post[:id] = SecureRandom.hex(16)
       end
 
-      def add_timestamp()
+      def add_timestamp
         Time.now.getutc.strftime('%Y%m%d%H%M%S')
       end
 

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

@@ -169,7 +169,7 @@ module ActiveMerchant #:nodoc:
       def recurring(money, creditcard, options={})
         ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
 
-        requires!(options, [:periodicity, :bimonthly, :monthly, :biweekly, :weekly, :yearly, :daily], :installments, :order_id )
+        requires!(options, [:periodicity, :bimonthly, :monthly, :biweekly, :weekly, :yearly, :daily], :installments, :order_id)
 
         options.update(
           :ordertype => 'SALE',
@@ -266,8 +266,8 @@ module ActiveMerchant #:nodoc:
         Response.new(successful?(response), response[:message], response,
           :test => test?,
           :authorization => response[:ordernum],
-          :avs_result => { :code => response[:avs].to_s[2,1] },
-          :cvv_result => response[:avs].to_s[3,1]
+          :avs_result => { :code => response[:avs].to_s[2, 1] },
+          :cvv_result => response[:avs].to_s[3, 1]
         )
       end
 

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

@@ -268,7 +268,7 @@ module ActiveMerchant #:nodoc:
           end
         elsif check?(payment_method)
           doc.echeck do
-            doc.accType(payment_method.account_type)
+            doc.accType(payment_method.account_type.capitalize)
             doc.accNum(payment_method.account_number)
             doc.routingNum(payment_method.routing_number)
             doc.checkNum(payment_method.number)
@@ -402,7 +402,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(kind, parsed, money)
-        (kind == :registerToken) ? parsed[:litleToken] : "#{parsed[:litleTxnId]};#{kind};#{money}"
+        kind == :registerToken ? parsed[:litleToken] : "#{parsed[:litleTxnId]};#{kind};#{money}"
       end
 
       def split_authorization(authorization)

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

@@ -142,7 +142,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/mercado_pago.rb

@@ -10,11 +10,6 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Mercado Pago'
       self.money_format = :dollars
 
-      CARD_BRAND = {
-        'american_express' => 'amex',
-        'diners_club' => 'diners'
-      }
-
       def initialize(options={})
         requires!(options, :access_token)
         super
@@ -23,18 +18,16 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment, options={})
         MultiResponse.run do |r|
           r.process { commit('tokenize', 'card_tokens', card_token_request(money, payment, options)) }
-          options.merge!(card_brand: (CARD_BRAND[payment.brand] || payment.brand))
-          options.merge!(card_token: r.authorization.split('|').first)
-          r.process { commit('purchase', 'payments', purchase_request(money, payment, options) ) }
+          options[:card_token] = r.authorization.split('|').first
+          r.process { commit('purchase', 'payments', purchase_request(money, payment, options)) }
         end
       end
 
       def authorize(money, payment, options={})
         MultiResponse.run do |r|
           r.process { commit('tokenize', 'card_tokens', card_token_request(money, payment, options)) }
-          options.merge!(card_brand: (CARD_BRAND[payment.brand] || payment.brand))
-          options.merge!(card_token: r.authorization.split('|').first)
-          r.process { commit('authorize', 'payments', authorize_request(money, payment, options) ) }
+          options[:card_token] = r.authorization.split('|').first
+          r.process { commit('authorize', 'payments', authorize_request(money, payment, options)) }
         end
       end
 
@@ -108,7 +101,7 @@ module ActiveMerchant #:nodoc:
 
       def authorize_request(money, payment, options = {})
         post = purchase_request(money, payment, options)
-        post.merge!(capture: false)
+        post[:capture] = false
         post
       end
 
@@ -181,7 +174,8 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, options)
         post[:token] = options[:card_token]
-        post[:payment_method_id] = options[:card_brand]
+        post[:issuer_id] = options[:issuer_id] if options[:issuer_id]
+        post[:payment_method_id] = options[:payment_method_id] if options[:payment_method_id]
       end
 
       def parse(body)

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

@@ -148,7 +148,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
         results
@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
         parameters[:transaction_amount]  = amount(money) if money unless action == 'V'
 
         response = begin
-          parse( ssl_post(url, post_data(action,parameters)) )
+          parse(ssl_post(url, post_data(action, parameters)))
         rescue ActiveMerchant::ResponseError => e
           { 'error_code' => '404',  'auth_response_text' => e.to_s }
         end
@@ -186,7 +186,7 @@ module ActiveMerchant #:nodoc:
         post[:profile_key] = @options[:password]
         post[:transaction_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
     end

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options = {})
         post = {}
-        post.merge!(:transactionid => authorization)
+        post[:transactionid] = authorization
         add_amount(post, money, options)
         commit('capture', money, post)
       end
@@ -83,11 +83,11 @@ module ActiveMerchant #:nodoc:
       def commit(action, money, parameters={})
         parameters['username'] = @options[:username]
         parameters['password'] = @options[:password]
-        parse(ssl_post(BASE_URL,post_data(action, parameters)))
+        parse(ssl_post(BASE_URL, post_data(action, parameters)))
       end
 
       def post_data(action, parameters = {})
-        parameters.merge!({:type => action})
+        parameters[:type] = action
         ret = ''
         for key in parameters.keys
           ret += "#{key}=#{CGI.escape(parameters[key].to_s)}"
@@ -99,7 +99,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(data)
-        responses =  CGI.parse(data).inject({}){|h,(k, v)| h[k] = v.first; h}
+        responses =  CGI.parse(data).inject({}) { |h, (k, v)| h[k] = v.first; h }
         Response.new(
           (responses['response'].to_i == 1),
           responses['responsetext'],

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

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

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
-        post.merge!('captureAmount' => amount(money))
+        post['captureAmount'] = amount(money)
         commit('processCapture', post)
       end
 
@@ -158,7 +158,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
@@ -203,7 +203,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(post)
-        post.collect{|k,v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
+        post.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
     end
   end

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

@@ -18,7 +18,7 @@ module ActiveMerchant #:nodoc:
 
       self.homepage_url = 'http://www.mercurypay.com'
       self.display_name = 'Mercury'
-      self.supported_countries = ['US','CA']
+      self.supported_countries = ['US', 'CA']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
       self.default_currency = 'USD'
 
@@ -349,7 +349,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def unescape_xml(escaped_xml)
-        escaped_xml.gsub(/\&gt;/,'>').gsub(/\&lt;/,'<')
+        escaped_xml.gsub(/\&gt;/, '>').gsub(/\&lt;/, '<')
       end
     end
   end

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

@@ -286,9 +286,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