activemerchant 1.86.0 → 1.87.0

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

@@ -141,7 +141,7 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :login, :shared_secret)
         @threeds_required = false
-        if (options[:threeDSRequired])
+        if options[:threeDSRequired]
           ActiveMerchant.deprecated(THREEDSECURE_REQUIRED_DEPRECATION_MESSAGE)
           @threeds_required = options[:threeDSRequired]
         end
@@ -278,7 +278,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_threeds_required(post, options)
-        add_pair(post, :threeDSRequired, (options[:threeds_required] || @threeds_required) ? 'Y' : 'N')
+        add_pair(post, :threeDSRequired, options[:threeds_required] || @threeds_required ? 'Y' : 'N')
       end
 
       def add_remote_address(post, options={})
@@ -334,13 +334,13 @@ module ActiveMerchant #:nodoc:
         street_match = AVS_STREET_MATCH[response[:avscv2ResponseCode].to_s[2, 1]]
 
         code = if postal_match == 'Y' && street_match == 'Y'
-          'M'
-        elsif postal_match == 'Y'
-          'P'
-        elsif street_match == 'Y'
-          'A'
-        else
-          'I'
+                 'M'
+               elsif postal_match == 'Y'
+                 'P'
+               elsif street_match == 'Y'
+                 'A'
+               else
+                 'I'
         end
 
         AVSResult.new({

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

@@ -3,7 +3,7 @@ module ActiveMerchant #:nodoc:
     class CardknoxGateway < Gateway
       self.live_url = 'https://x1.cardknox.com/gateway'
 
-      self.supported_countries = ['US','CA','GB']
+      self.supported_countries = ['US', 'CA', 'GB']
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
 
@@ -255,7 +255,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         fields = {}
         for line in body.split('&')
-          key, value = *line.scan( %r{^(\w+)\=(.*)$} ).flatten
+          key, value = *line.scan(%r{^(\w+)\=(.*)$}).flatten
           fields[key] = CGI.unescape(value.to_s)
         end
 
@@ -276,7 +276,7 @@ module ActiveMerchant #:nodoc:
           amount:            fields['xAuthAmount'],
           masked_card_num:   fields['xMaskedCardNumber'],
           masked_account_number: fields['MaskedAccountNumber']
-        }.delete_if{|k, v| v.nil?}
+        }.delete_if { |k, v| v.nil? }
       end
 
       def commit(action, source_type, parameters)
@@ -320,7 +320,7 @@ module ActiveMerchant #:nodoc:
         initial_parameters[:Hash] = "s/#{seed}/#{hash}/n" unless @options[:pin].blank?
         parameters = initial_parameters.merge(parameters)
 
-        parameters.reject{|k, v| v.blank?}.collect{ |key, value| "x#{key}=#{CGI.escape(value.to_s)}" }.join('&')
+        parameters.reject { |k, v| v.blank? }.collect { |key, value| "x#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -189,7 +189,7 @@ module ActiveMerchant #:nodoc:
         post[:authentication][:password] = @options[:password]
         post[:authentication][:entityId] = @options[:entity_id]
         post[:paymentType] = action
-        dot_flatten_hash(post).map {|key, value| "#{key}=#{CGI.escape(value.to_s)}"}.join('&')
+        dot_flatten_hash(post).map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def error_code_from(response)

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

@@ -136,11 +136,11 @@ module ActiveMerchant #:nodoc:
         match = body.match(/<cngateway>(.*)<\/cngateway>/)
         return nil unless match
 
-        Hash[CGI::parse(match[1]).map{|k,v| [k.to_sym,v.first]}]
+        Hash[CGI::parse(match[1]).map { |k, v| [k.to_sym, v.first] }]
       end
 
       def handle_response(response)
-        if (200...300).include?(response.code.to_i)
+        if (200...300).cover?(response.code.to_i)
           return response.body
         elsif response.code.to_i == 302
           return ssl_get(URI.parse(response['location']))

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

@@ -174,7 +174,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
@@ -188,7 +188,7 @@ module ActiveMerchant #:nodoc:
         return unless text
 
         if ActiveSupport::Inflector.method(:transliterate).arity == -2
-          ActiveSupport::Inflector.transliterate(text,'')
+          ActiveSupport::Inflector.transliterate(text, '')
         else
           text.gsub(/[^\x00-\x7F]+/, '')
         end

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.live_url = 'https://ww3.cenpos.net/6/transact.asmx'
 
-      self.supported_countries = %w(AD AI AG AR AU AT BS BB BE BZ BM BR BN BG CA HR CY CZ DK DM EE FI FR DE GR GD GY HK HU IS IN IL IT JP LV LI LT LU MY MT MX MC MS NL PA PL PT KN LC MF VC SM SG SK SI ZA ES SR SE CH TR GB US UY)
+      self.supported_countries = %w(AD AI AG AR AU AT BS BB BE BZ BM BR BN BG CA HR CY CZ DK DM EE FI FR DE GR GD GY HK HU IS IL IT JP LV LI LT LU MY MT MX MC MS NL PA PL PT KN LC MF VC SM SG SK SI ZA ES SR SE CH TR GB US UY)
       self.default_currency = 'USD'
       self.money_format = :dollars
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -219,7 +219,7 @@ module ActiveMerchant #:nodoc:
         doc.remove_namespaces!
         body = doc.xpath('//ProcessCreditCardResult')
         body.children.each do |node|
-          if (node.elements.size == 0)
+          if node.elements.size == 0
             response[node.name.underscore.to_sym] = node.text
           else
             node.elements.each do |childnode|

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

@@ -187,7 +187,7 @@ module ActiveMerchant #:nodoc:
         Nokogiri::XML(CGI.unescapeHTML(xml)).xpath('//response').children.each do |node|
           if node.text?
             next
-          elsif (node.elements.size == 0)
+          elsif node.elements.size == 0
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|

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

@@ -54,16 +54,16 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, amount, options)
 
         action = if payment.respond_to?(:number)
-           add_payment(post, payment)
-          '/authorizations'
-        elsif payment.kind_of?(String)
-          "/cards/#{payment}/authorizations"
-        else
-          raise ArgumentError.new("Unknown payment type #{payment.inspect}")
+                   add_payment(post, payment)
+                   '/authorizations'
+                 elsif payment.kind_of?(String)
+                   "/cards/#{payment}/authorizations"
+                 else
+                   raise ArgumentError.new("Unknown payment type #{payment.inspect}")
         end
 
         post[:recurring] = options[:recurring] if options[:recurring]
-        post[:threed_secure] = {pares: options[:pares]} if options[:pares]
+        post[:card][:pares] = options[:pares] if options[:pares]
 
         commit(action, post)
       end
@@ -108,7 +108,7 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(%r((Authorization: Basic )[\w=]+), '\1[FILTERED]').
           gsub(%r((&?card(?:\[|%5B)csc(?:\]|%5D)=)[^&]*)i, '\1[FILTERED]').
-          gsub(%r((&?card(?:\[|%5B)number(?:\]|%5D)=)[^&]*)i, '\1[FILTERED]')
+          gsub(%r((&?card(?:\[|%5B)pan(?:\]|%5D)=)[^&]*)i, '\1[FILTERED]')
       end
 
       private
@@ -126,12 +126,12 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, payment)
         card = {}
-        card[:number]       = payment.number
+        card[:pan]          = payment.number
         card[:expire_month] = '%02d'% payment.month
         card[:expire_year]  = payment.year
 
         if payment.verification_value?
-          card[:csc]  = payment.verification_value
+          card[:csc] = payment.verification_value
         end
 
         post[:card] = card if card.any?
@@ -139,8 +139,8 @@ module ActiveMerchant #:nodoc:
 
       def headers(api_key)
         {
-          'Authorization'  => 'Basic ' + Base64.strict_encode64("#{api_key}:"),
-          'User-Agent'     => "Clearhaus ActiveMerchantBindings/#{ActiveMerchant::VERSION}"
+          'Authorization' => 'Basic ' + Base64.strict_encode64("#{api_key}:"),
+          'User-Agent'    => "Clearhaus ActiveMerchantBindings/#{ActiveMerchant::VERSION}"
         }
       end
 

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

@@ -111,7 +111,7 @@ module ActiveMerchant #:nodoc:
         results = {}
 
         body.split(/\&/).each do |pair|
-          key,val = pair.split(%r{=})
+          key, val = pair.split(%r{=})
           results[key] = CGI.unescape(val)
         end
 
@@ -126,8 +126,8 @@ module ActiveMerchant #:nodoc:
         if response['returnText'].present?
           response['returnText']
         else
-          'Invalid response received from the CommerceGate API. ' +
-          'Please contact CommerceGate support if you continue to receive this message. ' +
+          'Invalid response received from the CommerceGate API. ' \
+          'Please contact CommerceGate support if you continue to receive this message. ' \
           "(The raw response returned by the API was #{response.inspect})"
         end
       end

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

@@ -147,7 +147,7 @@ module ActiveMerchant #:nodoc:
       def add_transaction_details(xml, amount, authorization, type, options={})
         xml.TransactionDetails do
           xml.MessageType type
-          xml.Amount(unit: 'Minor'){ xml.text(amount) } if amount
+          xml.Amount(unit: 'Minor') { xml.text(amount) } if amount
           xml.CardEaseReference authorization if authorization
           xml.VoidReason '01' if type == 'Void'
         end
@@ -157,7 +157,7 @@ module ActiveMerchant #:nodoc:
         xml.TerminalDetails do
           xml.TerminalID @options[:terminal_id]
           xml.TransactionKey @options[:transaction_key]
-          xml.Software(version: 'SoftwareVersion'){ xml.text('SoftwareName') }
+          xml.Software(version: 'SoftwareVersion') { xml.text('SoftwareName') }
         end
       end
 

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

@@ -129,6 +129,7 @@ module ActiveMerchant #:nodoc:
         add_email(post, options)
         add_3d_secure(post, options)
         add_echo(post, options)
+        add_submerchant_id(post, options)
         add_transaction_type(post, options)
 
         commit(:purchase, post)
@@ -142,6 +143,7 @@ module ActiveMerchant #:nodoc:
         add_email(post, options)
         add_3d_secure(post, options)
         add_echo(post, options)
+        add_submerchant_id(post, options)
         add_transaction_type(post, options)
 
         commit(:authorize, post)
@@ -153,6 +155,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_customer_data(post, options)
         add_echo(post, options)
+        add_submerchant_id(post, options)
 
         commit(:capture, post)
       end
@@ -162,6 +165,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         reference_action = add_reference(post, authorization)
         add_echo(post, options)
+        add_submerchant_id(post, options)
         post[:a1] = generate_unique_id
 
         commit(:void, post, reference_action)
@@ -173,6 +177,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_customer_data(post, options)
         add_echo(post, options)
+        add_submerchant_id(post, options)
 
         commit(:refund, post)
       end
@@ -184,6 +189,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_email(post, options)
         add_echo(post, options)
+        add_submerchant_id(post, options)
         add_transaction_type(post, options)
 
         commit(:credit, post)
@@ -268,6 +274,10 @@ module ActiveMerchant #:nodoc:
         post[:d2] = options[:echo] unless options[:echo].blank?
       end
 
+      def add_submerchant_id(post, options)
+        post[:h3] = options[:submerchant_id] if options[:submerchant_id]
+      end
+
       def add_transaction_type(post, options)
         post[:a9] = options[:transaction_type] if options[:transaction_type]
       end
@@ -307,11 +317,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(action, params, reference_action)
-        params.keys.each { |key| params[key] = params[key].to_s}
+        params.keys.each { |key| params[key] = params[key].to_s }
         params[:M] = @options[:merchant_id]
         params[:O] = request_action(action, reference_action)
         params[:K] = sign_request(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 request_action(action, reference_action)
@@ -327,7 +337,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[CGI::parse(body).map{|k,v| [k.upcase,v.first]}]
+        Hash[CGI::parse(body).map { |k, v| [k.upcase, v.first] }]
       end
 
       def success_from(response)

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

@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_terminal_number(post, options)
         add_operator_id(post, options)
-        add_invoice(post,0, options)
+        add_invoice(post, 0, options)
         add_payment(post, credit_card)
         add_address(post, credit_card, options)
         add_customer_data(post, options)
@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_money(post, money)
-        post[:Amount] = money.to_s.rjust(11,'0')
+        post[:Amount] = money.to_s.rjust(11, '0')
       end
 
       def add_operator_id(post, options)
@@ -179,7 +179,7 @@ module ActiveMerchant #:nodoc:
 
       def add_invoice(post, money,  options)
         post[:CurrencyCode] = options[:currency] || (currency(money) if money)
-        post[:InvoiceNumber] = options[:order_id].rjust(12,'0')
+        post[:InvoiceNumber] = options[:order_id].rjust(12, '0')
         post[:InputType] = 'I'
         post[:LanguageCode] = 'E'
       end
@@ -189,7 +189,7 @@ module ActiveMerchant #:nodoc:
           post[:Token] = split_authorization(payment)[3].strip
         else
           post[:CardType] = CARD_BRAND[payment.brand] || ' '
-          post[:CardNumber] = payment.number.rjust(40,' ')
+          post[:CardNumber] = payment.number.rjust(40, ' ')
           post[:ExpirationDate] = expdate(payment)
           post[:Cvv2Cvc2Number] = payment.verification_value
         end
@@ -224,7 +224,7 @@ module ActiveMerchant #:nodoc:
           commit_raw(action, parameters)
         else
           MultiResponse.run(true) do |r|
-            r.process { commit_raw(action, parameters)}
+            r.process { commit_raw(action, parameters) }
             r.process {
               split_auth = split_authorization(r.authorization)
               auth =  (action.include?('recur')? split_auth[4] : split_auth[0])
@@ -254,7 +254,7 @@ module ActiveMerchant #:nodoc:
         parameters[:CompanyNumber] = @options[:company_number]
         parameters[:MerchantNumber] = @options[:merchant_number]
         parameters = parameters.collect do |key, value|
-          "#{key}=#{value}" unless (value.nil? || value.empty?)
+          "#{key}=#{value}" unless value.nil? || value.empty?
         end.join('&')
         payload = Base64.strict_encode64(parameters)
         "auth-api-key=#{@options[:api_key]}&payload=#{payload}".strip

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

@@ -235,7 +235,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

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

@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
       XSD_VERSION = '1.121'
 
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :dankort, :maestro]
-      self.supported_countries = %w(US BR CA CN DK FI FR DE JP MX NO SE GB SG LB)
+      self.supported_countries = %w(US BR CA CN DK FI FR DE IN JP MX NO SE GB SG LB)
 
       self.default_currency = 'USD'
       self.currencies_without_fractions = %w(JPY)
@@ -113,7 +113,7 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, creditcard_or_reference, options = {})
         setup_address_hash(options)
-        commit(build_auth_request(money, creditcard_or_reference, options), :authorize, money, options )
+        commit(build_auth_request(money, creditcard_or_reference, options), :authorize, money, options)
       end
 
       def capture(money, authorization, options = {})
@@ -209,7 +209,7 @@ module ActiveMerchant #:nodoc:
       # Determines if a card can be used for Pinless Debit Card transactions
       def validate_pinless_debit_card(creditcard, options = {})
         requires!(options, :order_id)
-        commit(build_validate_pinless_debit_request(creditcard,options), :validate_pinless_debit_card, nil, options)
+        commit(build_validate_pinless_debit_request(creditcard, options), :validate_pinless_debit_card, nil, options)
       end
 
       def supports_scrubbing?
@@ -392,7 +392,7 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_validate_pinless_debit_request(creditcard,options)
+      def build_validate_pinless_debit_request(creditcard, options)
         xml = Builder::XmlMarkup.new :indent => 2
         add_creditcard(xml, creditcard)
         add_validate_pinless_debit_service(xml)
@@ -410,7 +410,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def extract_option prioritized_options, option_name
+      def extract_option(prioritized_options, option_name)
         options_matching_key = prioritized_options.detect do |options|
           options.has_key? option_name
         end
@@ -432,7 +432,7 @@ module ActiveMerchant #:nodoc:
       def add_merchant_data(xml, options)
         xml.tag! 'merchantID', @options[:login]
         xml.tag! 'merchantReferenceCode', options[:order_id] || generate_unique_id
-        xml.tag! 'clientLibrary','Ruby Active Merchant'
+        xml.tag! 'clientLibrary', 'Ruby Active Merchant'
         xml.tag! 'clientLibraryVersion',  VERSION
         xml.tag! 'clientEnvironment', RUBY_PLATFORM
       end
@@ -469,7 +469,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'accountNumber', creditcard.number
           xml.tag! 'expirationMonth', format(creditcard.month, :two_digits)
           xml.tag! 'expirationYear', format(creditcard.year, :four_digits)
-          xml.tag!('cvNumber', creditcard.verification_value) unless (@options[:ignore_cvv] || creditcard.verification_value.blank? )
+          xml.tag!('cvNumber', creditcard.verification_value) unless @options[:ignore_cvv] || creditcard.verification_value.blank?
           xml.tag! 'cardType', @@credit_card_codes[card_brand(creditcard).to_sym]
         end
       end
@@ -755,7 +755,7 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(reply, node)
         if node.has_elements?
-          node.elements.each{|e| parse_element(reply, e) }
+          node.elements.each { |e| parse_element(reply, e) }
         else
           if node.parent.name =~ /item/
             parent = node.parent.name