activemerchant 1.86.0 → 1.87.0

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

@@ -45,12 +45,12 @@ module ActiveMerchant #:nodoc:
 
         MultiResponse.run do |r|
           identifier = if(payment_method.respond_to?(:number))
-            r.process{store(payment_method, options)}
-            r.authorization
-          else
-            payment_method
+                         r.process { store(payment_method, options) }
+                         r.authorization
+                       else
+                         payment_method
           end
-          r.process{commit('debits', "cards/#{card_identifier_from(identifier)}/debits", post)}
+          r.process { commit('debits', "cards/#{card_identifier_from(identifier)}/debits", post) }
         end
       end
 
@@ -62,12 +62,12 @@ module ActiveMerchant #:nodoc:
 
         MultiResponse.run do |r|
           identifier = if(payment_method.respond_to?(:number))
-            r.process{store(payment_method, options)}
-            r.authorization
-          else
-            payment_method
+                         r.process { store(payment_method, options) }
+                         r.authorization
+                       else
+                         payment_method
           end
-          r.process{commit('card_holds', "cards/#{card_identifier_from(identifier)}/card_holds", post)}
+          r.process { commit('card_holds', "cards/#{card_identifier_from(identifier)}/card_holds", post) }
         end
       end
 
@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
         when %r{\|}
           uri = identifier.
                 split('|').
-                detect{|part| part.size > 0}
+                detect { |part| part.size > 0 }
           uri.split('/')[2]
         when %r{\/}
           identifier.split('/')[5]

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://test.ctpe.io/payment/ctpe'
       self.live_url = 'https://ctpe.io/payment/ctpe'
 
-      self.supported_countries = ['LI','US']
+      self.supported_countries = ['LI', 'US']
       self.default_currency = 'EUR'
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
 

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

@@ -168,11 +168,11 @@ module ActiveMerchant #:nodoc:
           return Response.new(false, 'Invalid credentials', {}, :test => test?)
         when '403'
           return Response.new(false, 'Not allowed', {}, :test => test?)
-        when '422'
-          return Response.new(false, 'Unprocessable Entity', {}, :test => test?)
-        when '500'
-          if e.response.body.split(' ')[0] == 'validation'
-            return Response.new(false, e.response.body.split(' ', 3)[2], {}, :test => test?)
+        when '422', '500'
+          if e.response.body.split(/\W+/).any? { |word| %w(validation configuration security).include?(word) }
+            error_message = e.response.body[/#{Regexp.escape('message=')}(.*?)#{Regexp.escape('&')}/m, 1].tr('+', ' ')
+            error_code = e.response.body[/#{Regexp.escape('errorCode=')}(.*?)#{Regexp.escape('&')}/m, 1]
+            return Response.new(false, error_code + ': ' + error_message, {}, :test => test?)
           end
         end
         raise

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

@@ -186,8 +186,9 @@ module ActiveMerchant #:nodoc:
         else
           post[:singleUseToken] = payment_method
         end
-        options.merge!({:vault_id => vault_id, :operation => secure_profile_action(:modify)})
-        add_secure_profile_variables(post,options)
+        options[:vault_id] = vault_id
+        options[:operation] = secure_profile_action(:modify)
+        add_secure_profile_variables(post, options)
         commit(post, true)
       end
 

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -193,11 +193,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def void_action(original_transaction_type)
-        (original_transaction_type == TRANSACTIONS[:refund]) ? :void_refund : :void_purchase
+        original_transaction_type == TRANSACTIONS[:refund] ? :void_refund : :void_purchase
       end
 
       def refund_action(type)
-        (type == TRANSACTIONS[:check_purchase]) ? :check_refund : :refund
+        type == TRANSACTIONS[:check_purchase] ? :check_refund : :refund
       end
 
       def secure_profile_action(type)
@@ -398,7 +398,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(params, use_profile_api = false)
-        post(post_data(params,use_profile_api),use_profile_api)
+        post(post_data(params, use_profile_api), use_profile_api)
       end
 
       def recurring_commit(params)
@@ -412,7 +412,7 @@ module ActiveMerchant #:nodoc:
           :test => test? || response[:authCode] == 'TEST',
           :authorization => authorization_from(response),
           :cvv_result => CVD_CODES[response[:cvdId]],
-          :avs_result => { :code => (AVS_CODES.include? response[:avsId]) ? AVS_CODES[response[:avsId]] : response[:avsId] }
+          :avs_result => { :code => AVS_CODES.include?(response[:avsId]) ? AVS_CODES[response[:avsId]] : response[:avsId] }
         )
       end
 
@@ -463,7 +463,7 @@ module ActiveMerchant #:nodoc:
         params[:vbvEnabled] = '0'
         params[:scEnabled] = '0'
 
-        params.reject{|k, v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
+        params.reject { |k, v| v.blank? }.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -330,7 +330,7 @@ module ActiveMerchant #:nodoc:
 
       def parse_recurring(response_fields, opts={}) # expected status?
         parsed = {}
-        response_fields.each do |k,v|
+        response_fields.each do |k, v|
           mapped_key = REBILL_FIELD_MAP.include?(k) ? REBILL_FIELD_MAP[k] : k
           parsed[mapped_key] = v
         end
@@ -345,14 +345,14 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         # The bp20api has max one value per form field.
-        response_fields = Hash[CGI::parse(body).map{|k,v| [k.upcase,v.first]}]
+        response_fields = Hash[CGI::parse(body).map { |k, v| [k.upcase, v.first] }]
 
         if response_fields.include? 'REBILL_ID'
           return parse_recurring(response_fields)
         end
 
         parsed = {}
-        response_fields.each do |k,v|
+        response_fields.each do |k, v|
           mapped_key = FIELD_MAP.include?(k) ? FIELD_MAP[k] : k
           parsed[mapped_key] = v
         end
@@ -374,7 +374,7 @@ module ActiveMerchant #:nodoc:
           if CARD_CODE_ERRORS.include?(parsed[:card_code])
             message = CVVResult.messages[parsed[:card_code]]
           elsif AVS_ERRORS.include?(parsed[:avs_result_code])
-            message = AVSResult.messages[ parsed[:avs_result_code] ]
+            message = AVSResult.messages[parsed[:avs_result_code]]
           else
             message = message.chomp('.')
           end
@@ -510,7 +510,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def handle_response(response)
-        if ignore_http_status || (200...300).include?(response.code.to_i)
+        if ignore_http_status || (200...300).cover?(response.code.to_i)
           return response.body
         end
         raise ResponseError.new(response)

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

@@ -230,7 +230,7 @@ module ActiveMerchant
 
       def parse_element(parsed, node)
         if !node.elements.empty?
-          node.elements.each {|e| parse_element(parsed, e) }
+          node.elements.each { |e| parse_element(parsed, e) }
         else
           parsed[node.name.downcase] = node.text
         end
@@ -262,7 +262,7 @@ module ActiveMerchant
 
       def url(action = nil)
         base = test? ? test_url : live_url
-        resource = (action == :store) ? 'vaulted-shoppers' : 'transactions'
+        resource = action == :store ? 'vaulted-shoppers' : 'transactions'
         "#{base}/#{resource}"
       end
 
@@ -279,7 +279,7 @@ module ActiveMerchant
       end
 
       def success_from(action, response)
-        (200...300).include?(response.code.to_i)
+        (200...300).cover?(response.code.to_i)
       end
 
       def message_from(succeeded, parsed_response)
@@ -288,7 +288,7 @@ module ActiveMerchant
       end
 
       def authorization_from(action, parsed_response)
-        (action == :store) ? vaulted_shopper_id(parsed_response) : parsed_response['transaction-id']
+        action == :store ? vaulted_shopper_id(parsed_response) : parsed_response['transaction-id']
       end
 
       def vaulted_shopper_id(parsed_response)
@@ -307,7 +307,7 @@ module ActiveMerchant
       end
 
       def root_element(action)
-        (action == :store) ? 'vaulted-shopper' : 'card-transaction'
+        action == :store ? 'vaulted-shopper' : 'card-transaction'
       end
 
       def headers

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

@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
         money = amount(money)
         case normalize(paysource)
         when /1$/
-          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true )
+          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true)
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE }, :test => true, :error_code => STANDARD_ERROR_CODE[:processing_error])
         else
@@ -106,7 +106,7 @@ module ActiveMerchant #:nodoc:
         when /1$/
           Response.new(true, SUCCESS_MESSAGE, {}, :test => true)
         when /2$/
-          Response.new(false, FAILURE_MESSAGE, {:error => FAILURE_MESSAGE },:test => true, :error_code => STANDARD_ERROR_CODE[:processing_error])
+          Response.new(false, FAILURE_MESSAGE, {:error => FAILURE_MESSAGE }, :test => true, :error_code => STANDARD_ERROR_CODE[:processing_error])
         else
           raise Error, UNSTORE_ERROR_MESSAGE
         end
@@ -130,7 +130,7 @@ module ActiveMerchant #:nodoc:
         money = amount(money)
         case normalize(paysource)
         when /1$/, AUTHORIZATION
-          Response.new(true, SUCCESS_MESSAGE, {:authorized_amount => money}, :test => true, :authorization => AUTHORIZATION )
+          Response.new(true, SUCCESS_MESSAGE, {:authorized_amount => money}, :test => true, :authorization => AUTHORIZATION)
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:authorized_amount => money, :error => FAILURE_MESSAGE }, :test => true, :error_code => STANDARD_ERROR_CODE[:processing_error])
         else

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

@@ -76,7 +76,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency for HDFC: #{k}")}
+      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency for HDFC: #{k}") }
       CURRENCY_CODES['ISK'] = '352'
       CURRENCY_CODES['EUR'] = '978'
       CURRENCY_CODES['USD'] = '840'
@@ -112,7 +112,7 @@ module ActiveMerchant #:nodoc:
         body.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|
@@ -130,7 +130,6 @@ module ActiveMerchant #:nodoc:
         post[:Processor] = @options[:processor]
         post[:MerchantID] = @options[:merchant_id]
 
-        url = (test? ? test_url : live_url)
         request = build_request(action, post)
         raw = ssl_post(url(action), request, headers)
         pairs = parse(raw)
@@ -182,7 +181,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(action, post)
-        mode = (action == 'void') ? 'cancel' : 'get'
+        mode = action == 'void' ? 'cancel' : 'get'
         xml = Builder::XmlMarkup.new :indent => 18
         xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
         xml.tag!("#{mode}Authorization") do
@@ -191,7 +190,7 @@ module ActiveMerchant #:nodoc:
           end
         end
         inner = CGI.escapeHTML(xml.target!)
-        envelope(mode).sub(/{{ :body }}/,inner)
+        envelope(mode).sub(/{{ :body }}/, inner)
       end
 
       def envelope(mode)
@@ -214,7 +213,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def six_random_digits
-        (0...6).map { (48 + rand(10)).chr }.join
+        (0...6).map { rand(48..57).chr }.join
       end
     end
   end

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

@@ -39,6 +39,7 @@ module ActiveMerchant #:nodoc:
     #
     class BraintreeBlueGateway < Gateway
       include BraintreeCommon
+      include Empty
 
       self.display_name = 'Braintree (Blue Platform)'
 
@@ -53,7 +54,7 @@ module ActiveMerchant #:nodoc:
         super
 
         if wiredump_device.present?
-          logger = ((Logger === wiredump_device) ? wiredump_device : Logger.new(wiredump_device))
+          logger = (Logger === wiredump_device ? wiredump_device : Logger.new(wiredump_device))
           logger.level = Logger::DEBUG
         else
           logger = Braintree::Configuration.logger.clone
@@ -69,7 +70,7 @@ module ActiveMerchant #:nodoc:
           :logger            => options[:logger] || logger
         )
 
-        @braintree_gateway = Braintree::Gateway.new( @configuration )
+        @braintree_gateway = Braintree::Gateway.new(@configuration)
       end
 
       def authorize(money, credit_card_or_vault_id, options = {})
@@ -123,7 +124,7 @@ module ActiveMerchant #:nodoc:
         if options[:customer].present?
           MultiResponse.new.tap do |r|
             customer_exists_response = nil
-            r.process{customer_exists_response = check_customer_exists(options[:customer])}
+            r.process { customer_exists_response = check_customer_exists(options[:customer]) }
             r.process do
               if customer_exists_response.params['exists']
                 add_credit_card_to_customer(creditcard, options)
@@ -143,7 +144,7 @@ module ActiveMerchant #:nodoc:
           braintree_credit_card = @braintree_gateway.customer.find(vault_id).credit_cards.detect(&:default?)
           return Response.new(false, 'Braintree::NotFoundError') if braintree_credit_card.nil?
 
-          options.merge!(:update_existing_token => braintree_credit_card.token)
+          options[:update_existing_token] = braintree_credit_card.token
           credit_card_params = merge_credit_card_options({
             :credit_card => {
               :cardholder_name => creditcard.name,
@@ -259,7 +260,10 @@ module ActiveMerchant #:nodoc:
             expiration_year: credit_card.year.to_s,
             device_data: options[:device_data],
           }
-          parameters[:billing_address] = map_address(options[:billing_address]) if options[:billing_address]
+          if options[:billing_address]
+            address = map_address(options[:billing_address])
+            parameters[:credit_card][:billing_address] = address unless address.all? { |_k, v| empty?(v) }
+          end
 
           result = @braintree_gateway.credit_card.create(parameters)
           ActiveMerchant::Billing::Response.new(
@@ -276,10 +280,10 @@ module ActiveMerchant #:nodoc:
 
       def scrub_email(email)
         return nil unless email.present?
-        return nil if (
+        return nil if
           email !~ /^.+@[^\.]+(\.[^\.]+)+[a-z]$/i ||
           email =~ /\.(con|met)$/i
-        )
+
         email
       end
 
@@ -303,13 +307,15 @@ module ActiveMerchant #:nodoc:
         end
 
         parameters[:credit_card] ||= {}
-        parameters[:credit_card].merge!(:options => valid_options)
-        parameters[:credit_card][:billing_address] = map_address(options[:billing_address]) if options[:billing_address]
+        parameters[:credit_card][:options] = valid_options
+        if options[:billing_address]
+          address = map_address(options[:billing_address])
+          parameters[:credit_card][:billing_address] = address unless address.all? { |_k, v| empty?(v) }
+        end
         parameters
       end
 
       def map_address(address)
-        return {} if address.nil?
         mapped = {
           :street_address => address[:address1],
           :extended_address => address[:address2],
@@ -318,7 +324,7 @@ module ActiveMerchant #:nodoc:
           :region => address[:state],
           :postal_code => scrub_zip(address[:zip]),
         }
-        if (address[:country] || address[:country_code_alpha2])
+        if address[:country] || address[:country_code_alpha2]
           mapped[:country_code_alpha2] = (address[:country] || address[:country_code_alpha2])
         elsif address[:country_name]
           mapped[:country_name] = address[:country_name]
@@ -568,7 +574,7 @@ module ActiveMerchant #:nodoc:
         }
 
         if options[:skip_advanced_fraud_checking]
-          parameters[:options].merge!({ :skip_advanced_fraud_checking => options[:skip_advanced_fraud_checking] })
+          parameters[:options][:skip_advanced_fraud_checking] = options[:skip_advanced_fraud_checking]
         end
 
         parameters[:custom_fields] = options[:custom_fields]

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

@@ -237,7 +237,7 @@ module ActiveMerchant #:nodoc:
         {
           :UserName => @options[:user_name],
           :Password => @options[:password]
-        }.merge(post).collect{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+        }.merge(post).collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
     end
   end

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

@@ -140,18 +140,18 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, creditcard, options={})
         post[:firstname] = creditcard.first_name
-        post[:lastname ] = creditcard.last_name
+        post[:lastname]  = creditcard.last_name
 
         return unless options[:billing_address]
 
         address = options[:billing_address]
-        post[:address1 ] = address[:address1]
-        post[:address2 ] = address[:address2]
-        post[:city     ] = address[:city]
-        post[:state    ] = address[:state]
-        post[:zip      ] = address[:zip]
-        post[:country  ] = address[:country]
-        post[:phone    ] = address[:phone]
+        post[:address1] = address[:address1]
+        post[:address2] = address[:address2]
+        post[:city]     = address[:city]
+        post[:state]    = address[:state]
+        post[:zip]      = address[:zip]
+        post[:country]  = address[:country]
+        post[:phone]    = address[:phone]
       end
 
       def add_reference(post, authorization)
@@ -167,15 +167,15 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, payment)
         post[:ccnumber] = payment.number
-        post[:ccexp   ] = "#{payment.month.to_s.rjust(2,"0")}#{payment.year.to_s[-2..-1]}"
-        post[:cvv     ] = payment.verification_value
+        post[:ccexp] = "#{payment.month.to_s.rjust(2, "0")}#{payment.year.to_s[-2..-1]}"
+        post[:cvv] = payment.verification_value
       end
 
       def parse(body)
         kvs = body.split('&')
 
         kvs.inject({}) { |h, kv|
-          k,v = kv.split('=')
+          k, v = kv.split('=')
           h[k] = v
           h
         }
@@ -219,7 +219,7 @@ module ActiveMerchant #:nodoc:
         parameters[:password] = @options[:password]
         parameters[:username] = @options[:username]
 
-        parameters.collect{|k,v| "#{k}=#{v}" }.join('&')
+        parameters.collect { |k, v| "#{k}=#{v}" }.join('&')
       end
 
       def error_code_from(response)