activemerchant 1.100.0 → 1.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823ed7b22c50e7910c846fe99b621d38589cc4ae2b01825219a344d08dee0024
-  data.tar.gz: 8cc6c8294cb70df4df71e805b7d9b336237540ada7e4867388eba7677ba37641
+  metadata.gz: cadecd1cc8fe450e59061eac7cf2c2ce023513d1338858809fe828df46a1b745
+  data.tar.gz: cc7e81f49b5b4b0f17cbd73c921a7b73cbd4c8f468d70722dc844a4973191ffa
 SHA512:
-  metadata.gz: 85b8024522112e07fd028f1331574ce47c4a7e343d8a92906d043f2448f4c656723151202f53de0f49627a4d5815fbda5d7ab81274268dd1cd2decf61b8b69bf
-  data.tar.gz: ce6135c3bd5c0c6985b60083abde4eef4a8bec4fb75c857ddb49a1a10d60608821ccca6337a7928d649b5fef7f847a191658db62004ec225c36b48e7ed9719c7
+  metadata.gz: 4d3889d6325099cff6ffef0dc9de3259afac3ff6d86292cd5dfa9e85208e9eae671436222ec84e08ad1104e77ede4ab475519229f5121c61498f79adaf7da104
+  data.tar.gz: 3e0b7935750ab8d772d62d78d6c359187d287835e997076ba0a1d66a3586424e63897892a736cbf7b720aa7e04633112aca6fb4cad57a8bcbee2885f13701ea7

data/CHANGELOG

@@ -1,6 +1,16 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+== Version 1.101.0 (Nov 4, 2019)
+* Add UYI to list of currencies without fractions [curiousepic] #3416
+* Quickbooks: Add OAuth 2.0 support and void action [britth] #3397
+* Credorax: Stop always sending r1 parameter [molbrown] #3415
+* Rubocop: Layout/RescueEnsureAlignment fix [leila-alderman] #3411
+* CyberSource: Send issuer data on capture [leila-alderman] #3404
+* Rubocop: Style/IfUnlessModifier [nfarve] #3390
+* Redsys: Updates to parse method for non-3DS responses [britth] #3391
+* Netbanx: Add 3DS2 Support [Jujhar] #3394
+
 == Version 1.100.0 (Oct 16, 2019)
 * Stripe: Restore non-auto capture behaviour for card present transactions [PatrickFang] #3258
 * Revert "Revert "Worldpay: Switch to Nokogiri"" [curiousepic] #3373

data/lib/active_merchant/billing/check.rb

@@ -35,13 +35,9 @@ module ActiveMerchant #:nodoc:
 
         errors << [:routing_number, 'is invalid'] unless valid_routing_number?
 
-        if(!empty?(account_holder_type) && !%w[business personal].include?(account_holder_type.to_s))
-          errors << [:account_holder_type, 'must be personal or business']
-        end
+        errors << [:account_holder_type, 'must be personal or business'] if !empty?(account_holder_type) && !%w[business personal].include?(account_holder_type.to_s)
 
-        if(!empty?(account_type) && !%w[checking savings].include?(account_type.to_s))
-          errors << [:account_type, 'must be checking or savings']
-        end
+        errors << [:account_type, 'must be checking or savings'] if !empty?(account_type) && !%w[checking savings].include?(account_type.to_s)
 
         errors_hash(errors)
       end

data/lib/active_merchant/billing/credit_card.rb

@@ -367,9 +367,7 @@ module ActiveMerchant #:nodoc:
         errors = []
 
         if verification_value?
-          unless valid_card_verification_value?(verification_value, brand)
-            errors << [:verification_value, "should be #{card_verification_value_length(brand)} digits"]
-          end
+          errors << [:verification_value, "should be #{card_verification_value_length(brand)} digits"] unless valid_card_verification_value?(verification_value, brand)
         elsif requires_verification_value? && !valid_card_verification_value?(verification_value, brand)
           errors << [:verification_value, 'is required']
         end

data/lib/active_merchant/billing/gateway.rb

@@ -123,8 +123,9 @@ module ActiveMerchant #:nodoc:
       class_attribute :supported_cardtypes
       self.supported_cardtypes = []
 
+      # This default list of currencies without fractions are from https://en.wikipedia.org/wiki/ISO_4217
       class_attribute :currencies_without_fractions, :currencies_with_three_decimal_places
-      self.currencies_without_fractions = %w(BIF BYR CLP CVE DJF GNF ISK JPY KMF KRW PYG RWF UGX VND VUV XAF XOF XPF)
+      self.currencies_without_fractions = %w(BIF BYR CLP CVE DJF GNF ISK JPY KMF KRW PYG RWF UGX UYI VND VUV XAF XOF XPF)
       self.currencies_with_three_decimal_places = %w()
 
       class_attribute :homepage_url
@@ -155,9 +156,7 @@ module ActiveMerchant #:nodoc:
 
       def self.supported_countries=(country_codes)
         country_codes.each do |country_code|
-          unless ActiveMerchant::Country.find(country_code)
-            raise ActiveMerchant::InvalidCountryCodeError, "No country could be found for the country #{country_code}"
-          end
+          raise ActiveMerchant::InvalidCountryCodeError, "No country could be found for the country #{country_code}" unless ActiveMerchant::Country.find(country_code)
         end
         @supported_countries = country_codes.dup
       end
@@ -257,9 +256,7 @@ module ActiveMerchant #:nodoc:
                   money
         end
 
-        if money.is_a?(String)
-          raise ArgumentError, 'money amount must be a positive Integer in cents.'
-        end
+        raise ArgumentError, 'money amount must be a positive Integer in cents.' if money.is_a?(String)
 
         if self.money_format == :cents
           cents.to_s

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

@@ -157,9 +157,7 @@ module ActiveMerchant
       end
 
       def credit(amount, payment, options={})
-        if payment.is_a?(String)
-          raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card or use the #refund method.'
-        end
+        raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card or use the #refund method.' if payment.is_a?(String)
 
         commit(:credit) do |xml|
           add_order_id(xml, options)
@@ -479,12 +477,8 @@ module ActiveMerchant
             xml.creditCard do
               xml.cardNumber(truncate(credit_card.number, 16))
               xml.expirationDate(format(credit_card.month, :two_digits) + '/' + format(credit_card.year, :four_digits))
-              if credit_card.valid_card_verification_value?(credit_card.verification_value, credit_card.brand)
-                xml.cardCode(credit_card.verification_value)
-              end
-              if credit_card.is_a?(NetworkTokenizationCreditCard) && action != :credit
-                xml.cryptogram(credit_card.payment_cryptogram)
-              end
+              xml.cardCode(credit_card.verification_value) if credit_card.valid_card_verification_value?(credit_card.verification_value, credit_card.brand)
+              xml.cryptogram(credit_card.payment_cryptogram) if credit_card.is_a?(NetworkTokenizationCreditCard) && action != :credit
             end
           end
         end

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

@@ -147,9 +147,7 @@ module ActiveMerchant #:nodoc:
 
       # Builds recurring billing request
       def build_recurring_request(action, options = {})
-        unless RECURRING_ACTIONS.include?(action)
-          raise StandardError, "Invalid Automated Recurring Billing Action: #{action}"
-        end
+        raise StandardError, "Invalid Automated Recurring Billing Action: #{action}" unless RECURRING_ACTIONS.include?(action)
 
         xml = Builder::XmlMarkup.new(:indent => 2)
         xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')

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

@@ -485,9 +485,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(action, options = {})
-        unless CIM_ACTIONS.include?(action)
-          raise StandardError, "Invalid Customer Information Manager Action: #{action}"
-        end
+        raise StandardError, "Invalid Customer Information Manager Action: #{action}" unless CIM_ACTIONS.include?(action)
 
         xml = Builder::XmlMarkup.new(:indent => 2)
         xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
@@ -657,9 +655,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_transaction(xml, transaction)
-        unless CIM_TRANSACTION_TYPES.include?(transaction[:type])
-          raise StandardError, "Invalid Customer Information Manager Transaction Type: #{transaction[:type]}"
-        end
+        raise StandardError, "Invalid Customer Information Manager Transaction Type: #{transaction[:type]}" unless CIM_TRANSACTION_TYPES.include?(transaction[:type])
 
         xml.tag!('transaction') do
           xml.tag!(CIM_TRANSACTION_TYPES[transaction[:type]]) do
@@ -698,9 +694,7 @@ module ActiveMerchant #:nodoc:
             if [:auth_capture, :auth_only, :capture_only].include?(transaction[:type])
               xml.tag!('recurringBilling', transaction[:recurring_billing]) if transaction.has_key?(:recurring_billing)
             end
-            unless [:void, :refund, :prior_auth_capture].include?(transaction[:type])
-              tag_unless_blank(xml, 'cardCode', transaction[:card_code])
-            end
+            tag_unless_blank(xml, 'cardCode', transaction[:card_code]) unless [:void, :refund, :prior_auth_capture].include?(transaction[:type])
           end
         end
       end
@@ -942,9 +936,7 @@ module ActiveMerchant #:nodoc:
         xml = REXML::Document.new(xml)
         root = REXML::XPath.first(xml, "//#{CIM_ACTIONS[action]}Response") ||
                REXML::XPath.first(xml, '//ErrorResponse')
-        if root
-          response = parse_element(root)
-        end
+        response = parse_element(root) if root
 
         response
       end

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

@@ -93,9 +93,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse_element(response, node)
-        if node.has_attributes?
-          node.attributes.each { |name, value| response["#{node.name}_#{name}".underscore.to_sym] = value }
-        end
+        node.attributes.each { |name, value| response["#{node.name}_#{name}".underscore.to_sym] = value } if node.has_attributes?
 
         if node.has_elements?
           node.elements.each { |element| parse_element(response, element) }

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

@@ -155,17 +155,18 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(entity_name, path, post, method=:post)
-        raw_response = begin
-          parse(ssl_request(
-            method,
-            live_url + "/#{path}",
-            post_data(post),
-            headers
-          ))
-        rescue ResponseError => e
-          raise unless(e.response.code.to_s =~ /4\d\d/)
-          parse(e.response.body)
-        end
+        raw_response =
+          begin
+            parse(ssl_request(
+              method,
+              live_url + "/#{path}",
+              post_data(post),
+              headers
+            ))
+          rescue ResponseError => e
+            raise unless(e.response.code.to_s =~ /4\d\d/)
+            parse(e.response.body)
+          end
 
         Response.new(
           success_from(entity_name, raw_response),

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

@@ -351,9 +351,7 @@ module ActiveMerchant #:nodoc:
         # The bp20api has max one value per form field.
         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
+        return parse_recurring(response_fields) if response_fields.include? 'REBILL_ID'
 
         parsed = {}
         response_fields.each do |k, v|
@@ -514,9 +512,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def handle_response(response)
-        if ignore_http_status || (200...300).cover?(response.code.to_i)
-          return response.body
-        end
+        return response.body if ignore_http_status || (200...300).cover?(response.code.to_i)
         raise ResponseError.new(response)
       end
     end

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

@@ -307,9 +307,7 @@ module ActiveMerchant
         vaulted_shopper_id = payment_method_details.vaulted_shopper_id
         doc.send('vaulted-shopper-id', vaulted_shopper_id) if vaulted_shopper_id
 
-        if payment_method_details.check?
-          add_echeck_transaction(doc, payment_method_details.payment_method, options, vaulted_shopper_id.present?)
-        end
+        add_echeck_transaction(doc, payment_method_details.payment_method, options, vaulted_shopper_id.present?) if payment_method_details.check?
 
         add_fraud_info(doc, options)
         add_description(doc, options)

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

@@ -6,9 +6,7 @@ rescue LoadError
   raise 'Could not load the braintree gem.  Use `gem install braintree` to install it.'
 end
 
-unless Braintree::Version::Major == 2 && Braintree::Version::Minor >= 78
-  raise "Need braintree gem >= 2.78.0. Run `gem install braintree --version '~>2.78'` to get the correct version."
-end
+raise "Need braintree gem >= 2.78.0. Run `gem install braintree --version '~>2.78'` to get the correct version." unless Braintree::Version::Major == 2 && Braintree::Version::Minor >= 78
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -302,9 +300,7 @@ module ActiveMerchant #:nodoc:
           valid_options[key] = value if [:update_existing_token, :verify_card, :verification_merchant_account_id].include?(key)
         end
 
-        if valid_options.include?(:verify_card) && @merchant_account_id
-          valid_options[:verification_merchant_account_id] ||= @merchant_account_id
-        end
+        valid_options[:verification_merchant_account_id] ||= @merchant_account_id if valid_options.include?(:verify_card) && @merchant_account_id
 
         parameters[:credit_card] ||= {}
         parameters[:credit_card][:options] = valid_options
@@ -328,9 +324,7 @@ module ActiveMerchant #:nodoc:
         mapped[:country_code_alpha2] = (address[:country] || address[:country_code_alpha2]) if address[:country] || address[:country_code_alpha2]
         mapped[:country_name] = address[:country_name] if address[:country_name]
         mapped[:country_code_alpha3] = address[:country_code_alpha3] if address[:country_code_alpha3]
-        unless address[:country].blank?
-          mapped[:country_code_alpha3] ||= Country.find(address[:country]).code(:alpha3).value
-        end
+        mapped[:country_code_alpha3] ||= Country.find(address[:country]).code(:alpha3).value unless address[:country].blank?
         mapped[:country_code_numeric] = address[:country_code_numeric] if address[:country_code_numeric]
 
         mapped
@@ -494,9 +488,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def transaction_hash(result)
-        unless result.success?
-          return { 'processor_response_code' => response_code_from_result(result) }
-        end
+        return { 'processor_response_code' => response_code_from_result(result) } unless result.success?
 
         transaction = result.transaction
         if transaction.vault_customer
@@ -588,17 +580,11 @@ module ActiveMerchant #:nodoc:
           }
         }
 
-        if options[:skip_advanced_fraud_checking]
-          parameters[:options][:skip_advanced_fraud_checking] = options[:skip_advanced_fraud_checking]
-        end
+        parameters[:options][:skip_advanced_fraud_checking] = options[:skip_advanced_fraud_checking] if options[:skip_advanced_fraud_checking]
 
-        if options[:skip_avs]
-          parameters[:options][:skip_avs] = options[:skip_avs]
-        end
+        parameters[:options][:skip_avs] = options[:skip_avs] if options[:skip_avs]
 
-        if options[:skip_cvv]
-          parameters[:options][:skip_cvv] = options[:skip_cvv]
-        end
+        parameters[:options][:skip_cvv] = options[:skip_cvv] if options[:skip_cvv]
 
         parameters[:custom_fields] = options[:custom_fields]
         parameters[:device_data] = options[:device_data] if options[:device_data]

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

@@ -143,9 +143,7 @@ module ActiveMerchant #:nodoc:
           response[:error_message] = root.elements['ERROR/descripcion'].text
         else
           if root.elements['OPERACION'].attributes['numeroOperacion'] == '000'
-            if(root.elements['OPERACION/numeroAutorizacion'])
-              response[:authorization] = root.elements['OPERACION/numeroAutorizacion'].text
-            end
+            response[:authorization] = root.elements['OPERACION/numeroAutorizacion'].text if root.elements['OPERACION/numeroAutorizacion']
           else
             response[:authorization] = root.attributes['numeroOperacion']
           end

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

@@ -107,9 +107,7 @@ module ActiveMerchant #:nodoc:
         xml.bill_cc_ payment_method.number
         xml.bill_expmonth_ format(payment_method.month, :two_digits)
         xml.bill_expyear_ format(payment_method.year, :four_digits)
-        if payment_method.verification_value?
-          xml.bill_cvv2_ payment_method.verification_value
-        end
+        xml.bill_cvv2_ payment_method.verification_value if payment_method.verification_value?
       end
 
       def add_billing_info(xml, options)

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

@@ -152,9 +152,7 @@ module ActiveMerchant #:nodoc:
         begin
           raw_response = (action == :verify_payment ? ssl_get("#{base_url}/payments/#{post}", headers) : ssl_post(url(post, action, authorization), post.to_json, headers))
           response = parse(raw_response)
-          if action == :capture && response.key?('_links')
-            response['id'] = response['_links']['payment']['href'].split('/')[-1]
-          end
+          response['id'] = response['_links']['payment']['href'].split('/')[-1] if action == :capture && response.key?('_links')
         rescue ResponseError => e
           raise unless e.response.code.to_s =~ /4\d\d/
           response = parse(e.response.body)

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

@@ -130,9 +130,7 @@ module ActiveMerchant #:nodoc:
         card[:expire_month] = '%02d'% payment.month
         card[:expire_year]  = payment.year
 
-        if payment.verification_value?
-          card[:csc] = payment.verification_value
-        end
+        card[:csc] = payment.verification_value if payment.verification_value?
 
         post[:card] = card if card.any?
       end
@@ -161,12 +159,13 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        response = begin
-          parse(ssl_post(url, body, headers))
-        rescue ResponseError => e
-          raise unless(e.response.code.to_s =~ /400/)
-          parse(e.response.body)
-        end
+        response =
+          begin
+            parse(ssl_post(url, body, headers))
+          rescue ResponseError => e
+            raise unless(e.response.code.to_s =~ /400/)
+            parse(e.response.body)
+          end
 
         Response.new(
           success_from(response),
@@ -211,9 +210,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(response)
-        unless success_from(response)
-          response['status']['code']
-        end
+        response['status']['code'] unless success_from(response)
       end
     end
   end

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

@@ -358,7 +358,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_processor(post, options)
-        post[:r1] = options[:processor] || 'CREDORAX'
+        post[:r1] = options[:processor] if options[:processor]
         post[:r2] = options[:processor_merchant_id] if options[:processor_merchant_id]
       end
 

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

@@ -208,11 +208,12 @@ module ActiveMerchant #:nodoc:
       }
 
       def commit(action, params)
-        response = begin
-          parse(ssl_post(url + ACTIONS[action], post_data(action, params), headers))
-        rescue ResponseError => e
-          parse(e.response.body)
-        end
+        response =
+          begin
+            parse(ssl_post(url + ACTIONS[action], post_data(action, params), headers))
+          rescue ResponseError => e
+            parse(e.response.body)
+          end
 
         success = success_from(response)
 

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

@@ -290,6 +290,7 @@ module ActiveMerchant #:nodoc:
         add_purchase_data(xml, money, true, options)
         add_capture_service(xml, request_id, request_token)
         add_business_rules_data(xml, authorization, options)
+        add_issuer_additional_data(xml, options)
         xml.target!
       end
 

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

@@ -123,9 +123,7 @@ module ActiveMerchant
           add_authentication(xml)
 
           xml.tag! :Transaction do
-            if options[:set_up_continuous_authority]
-              xml.tag! :ContAuthTxn, :type => 'setup'
-            end
+            xml.tag! :ContAuthTxn, :type => 'setup' if options[:set_up_continuous_authority]
             xml.tag! :CardTxn do
               xml.tag! :method, type
               add_credit_card(xml, credit_card, options[:billing_address])

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

@@ -211,9 +211,7 @@ module ActiveMerchant #:nodoc:
         if error = response.dig('status_details', 'error')
           message = error.dig('reason', 'description')
         elsif response['error_type']
-          if response['validation_errors']
-            message = response['validation_errors'].map { |errors| "#{errors['code']}: #{errors['param']}" }.join(', ')
-          end
+          message = response['validation_errors'].map { |errors| "#{errors['code']}: #{errors['param']}" }.join(', ') if response['validation_errors']
           message ||= response['error_type']
         end