activemerchant 1.100.0 → 1.133.0

data/README.md

@@ -1,6 +1,6 @@
 # Active Merchant
-[![Build Status](https://travis-ci.org/activemerchant/active_merchant.png?branch=master)](https://travis-ci.org/activemerchant/active_merchant)
-[![Code Climate](https://codeclimate.com/github/activemerchant/active_merchant.png)](https://codeclimate.com/github/activemerchant/active_merchant)
+[![Build Status](https://github.com/activemerchant/active_merchant/workflows/CI/badge.svg?branch=master)](https://github.com/activemerchant/active_merchant/actions?query=workflow%3ACI)
+[![Code Climate](https://codeclimate.com/github/activemerchant/active_merchant.svg)](https://codeclimate.com/github/activemerchant/active_merchant)
 
 Active Merchant is an extraction from the ecommerce system [Shopify](http://www.shopify.com).
 Shopify's requirements for a simple and unified API to access dozens of different payment
@@ -17,7 +17,7 @@ from an ever-growing set of contributors.
 See [GettingStarted.md](GettingStarted.md) if you want to learn more about using Active Merchant in your
 applications.
 
-If you'd like to contribute to Active Merchant, please start with our [contribution guide](CONTRIBUTING.md).
+If you'd like to contribute to Active Merchant, please start with our [Contribution Guide](https://github.com/activemerchant/active_merchant/wiki/Contributing).
 
 ## Installation
 
@@ -81,6 +81,8 @@ if credit_card.validate.empty?
 end
 ```
 
+## Contributing
+
 For more in-depth documentation and tutorials, see [GettingStarted.md](GettingStarted.md) and the
 [API documentation](http://www.rubydoc.info/github/activemerchant/active_merchant/).
 
@@ -91,8 +93,9 @@ guide and [Standardized 3DS Fields](https://github.com/activemerchant/active_mer
 
 The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wikis) contains a [table of features supported by each gateway](https://github.com/activemerchant/active_merchant/wiki/Gateway-Feature-Matrix).
 
+* [Adyen](https://www.adyen.com/) - US, AT, AU, BE, BG, BR, CH, CY, CZ, DE, DK, EE, ES, FI, FR, GB, GI, GR, HK, HU, IE, IS, IT, LI, LT, LU, LV, MC, MT, MX, NL, NO, PL, PT, RO, SE, SG, SK, SI
 * [Authorize.Net CIM](http://www.authorize.net/) - US
-* [Authorize.Net](http://www.authorize.net/) - AD, AT, AU, BE, BG, CA, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GB, GI, GR, HU, IE, IT, LI, LU, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, SM, TR, US, VA
+* [Authorize.Net](http://www.authorize.net/) - AU, CA, US
 * [Axcess MS](http://www.axcessms.com/) - AD, AT, BE, BG, BR, CA, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HR, HU, IE, IL, IM, IS, IT, LI, LT, LU, LV, MC, MT, MX, NL, NO, PL, PT, RO, RU, SE, SI, SK, TR, US, VA
 * [Balanced](https://www.balancedpayments.com/) - US
 * [Bambora Asia-Pacific](http://www.bambora.com/) - AU, NZ
@@ -112,7 +115,7 @@ The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wiki
 * [Cecabank](http://www.ceca.es/es/) - ES
 * [Cenpos](https://www.cenpos.com/) - 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
 * [CAMS: Central Account Management System](https://www.centralams.com/) - US
-* [Checkout.com](https://www.checkout.com/) - AT, BE, BG, CY, CZ, DE, DK, EE, ES, FI, FR, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, MU, NL, NO, PL, PT, RO, SE, SI, SK, US
+* [Checkout.com](https://www.checkout.com/) - AD, AE, AR, AT, AU, BE, BG, BH, BR, CH, CL, CN, CO, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GR, HK, HR, HU, IE, IS, IT, JO, JP, KW, LI, LT, LU, LV, MC, MT, MX, MY, NL, NO, NZ, OM, PE, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, US
 * [Clearhaus](https://www.clearhaus.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GL, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK
 * [Commercegate](http://www.commercegate.com/) - AD, AT, AX, BE, BG, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GG, GI, GR, HR, HU, IE, IM, IS, IT, JE, LI, LT, LU, LV, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, VA
 * [Conekta](https://conekta.io) - MX
@@ -157,9 +160,8 @@ The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wiki
 * [Metrics Global](http://www.metricsglobal.com) - US
 * [MasterCard Internet Gateway Service (MiGS)](http://mastercard.com/mastercardsps) - AU, AE, BD, BN, EG, HK, ID, IN, JO, KW, LB, LK, MU, MV, MY, NZ, OM, PH, QA, SA, SG, TT, VN
 * [Modern Payments](http://www.modpay.com) - US
-* [MONEI](http://www.monei.net/) - AD, AT, BE, BG, CA, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HU, IE, IL, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK, TR, US, VA
+* [MONEI](http://www.monei.com/) - AD, AT, BE, BG, CA, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HU, IE, IL, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK, TR, US, VA
 * [Moneris](http://www.moneris.com/) - CA
-* [Moneris (US)](http://www.monerisusa.com/) - US
 * [MoneyMovers](http://mmoa.us/) - US
 * [NAB Transact](http://transact.nab.com.au) - AU
 * [NELiX TransaX](https://www.nelixtransax.com/) - US
@@ -183,7 +185,7 @@ The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wiki
 * [Paybox Direct](http://www.paybox.com/) - FR
 * [Payeezy](https://developer.payeezy.com/) - CA, US
 * [Payex](http://payex.com/) - DK, FI, NO, SE
-* [PaymentExpress](http://www.paymentexpress.com/) - AU, CA, DE, ES, FR, GB, HK, IE, MY, NL, NZ, SG, US, ZA
+* [Windcave (formerly PaymentExpress)](https://www.windcave.com/) - AU, CA, DE, ES, FR, GB, HK, IE, MY, NL, NZ, SG, US, ZA
 * [PAYMILL](https://paymill.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HU, IE, IL, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK, TR, VA
 * [PayPal Express Checkout](https://www.paypal.com/webapps/mpp/express-checkout) - US, CA, SG, AU
 * [PayPal Express Checkout (UK)](https://www.paypal.com/uk/webapps/mpp/express-checkout) - GB
@@ -244,4 +246,4 @@ Functionality or APIs that are deprecated will be marked as such. Deprecated fun
 
 ## Ruby and Rails compatibility policies
 
-Because Active Merchant is a payment library, it needs to take security seriously. For this reason, Active Merchant guarantees compatibility only with actively supported versions of Ruby and Rails. At the time of this writing, that means that Ruby 2.3+ and Rails 4.2+ are supported.
+Because Active Merchant is a payment library, it needs to take security seriously. For this reason, Active Merchant guarantees compatibility only with actively supported versions of Ruby and Rails. At the time of this writing, that means that Ruby 2.5+ and Rails 5.0+ are supported.

data/lib/active_merchant/billing/avs_result.rb

@@ -39,10 +39,10 @@ module ActiveMerchant
 
       # Map vendor's AVS result code to a postal match code
       POSTAL_MATCH_CODE = {
-        'Y' => %w( D H F H J L M P Q V W X Y Z ),
-        'N' => %w( A C K N O ),
-        'X' => %w( G S ),
-        nil => %w( B E I R T U )
+        'Y' => %w(D H F H J L M P Q V W X Y Z),
+        'N' => %w(A C K N O),
+        'X' => %w(G S),
+        nil => %w(B E I R T U)
       }.inject({}) do |map, (type, codes)|
         codes.each { |code| map[code] = type }
         map
@@ -50,10 +50,10 @@ module ActiveMerchant
 
       # Map vendor's AVS result code to a street match code
       STREET_MATCH_CODE = {
-        'Y' => %w( A B D H J M O Q T V X Y ),
-        'N' => %w( C K L N W Z ),
-        'X' => %w( G S ),
-        nil => %w( E F I P R U )
+        'Y' => %w(A B D H J M O Q T V X Y),
+        'N' => %w(C K L N W Z),
+        'X' => %w(G S),
+        nil => %w(E F I P R U)
       }.inject({}) do |map, (type, codes)|
         codes.each { |code| map[code] = type }
         map
@@ -88,7 +88,7 @@ module ActiveMerchant
         { 'code' => code,
           'message' => message,
           'street_match' => street_match,
-          'postal_match' => postal_match}
+          'postal_match' => postal_match }
       end
     end
   end

data/lib/active_merchant/billing/base.rb

@@ -39,19 +39,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Return the matching integration module
-      # You can then get the notification from the module
-      # * <tt>bogus</tt>: Bogus - Does nothing (for testing)
-      # * <tt>chronopay</tt>: Chronopay
-      # * <tt>paypal</tt>: Paypal
-      #
-      #   chronopay = ActiveMerchant::Billing::Base.integration('chronopay')
-      #   notification = chronopay.notification(raw_post)
-      #
-      def self.integration(name)
-        Billing::Integrations.const_get(name.to_s.downcase.camelize)
-      end
-
       # A check to see if we're in test mode
       def self.test?
         mode == :test

data/lib/active_merchant/billing/check.rb

@@ -13,6 +13,16 @@ module ActiveMerchant #:nodoc:
       # Used for Canadian bank accounts
       attr_accessor :institution_number, :transit_number
 
+      # Canadian Institution Numbers
+      # Partial list found here: https://en.wikipedia.org/wiki/Routing_number_(Canada)
+      CAN_INSTITUTION_NUMBERS = %w(
+        001 002 003 004 006 010 016 030 039 117 127 177 219 245 260 269 270 308
+        309 310 315 320 338 340 509 540 608 614 623 809 815 819 828 829 837 839
+        865 879 889 899 241 242 248 250 265 275 277 290 294 301 303 307 311 314
+        321 323 327 328 330 332 334 335 342 343 346 352 355 361 362 366 370 372
+        376 378 807 853 890 618 842
+      )
+
       def name
         @name ||= "#{first_name} #{last_name}".strip
       end
@@ -29,19 +39,15 @@ module ActiveMerchant #:nodoc:
       def validate
         errors = []
 
-        [:name, :routing_number, :account_number].each do |attr|
+        %i[name routing_number account_number].each do |attr|
           errors << [attr, 'cannot be empty'] if empty?(self.send(attr))
         end
 
         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
@@ -54,25 +60,51 @@ module ActiveMerchant #:nodoc:
         false
       end
 
+      def valid_routing_number?
+        digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
+        case digits.size
+        when 9
+          return checksum(digits) == 0 || CAN_INSTITUTION_NUMBERS.include?(routing_number[1..3])
+        when 8
+          return CAN_INSTITUTION_NUMBERS.include?(routing_number[5..7])
+        end
+
+        false
+      end
+
       # Routing numbers may be validated by calculating a checksum and dividing it by 10. The
       # formula is:
       #   (3(d1 + d4 + d7) + 7(d2 + d5 + d8) + 1(d3 + d6 + d9))mod 10 = 0
       # See http://en.wikipedia.org/wiki/Routing_transit_number#Internal_checksums
-      def valid_routing_number?
+      def checksum(digits)
+        ((3 * (digits[0] + digits[3] + digits[6])) +
+        (7 * (digits[1] + digits[4] + digits[7])) +
+        (digits[2] + digits[5] + digits[8])) % 10
+      end
+
+      # Always return MICR-formatted routing number for Canadian routing numbers, US routing numbers unchanged
+      def micr_format_routing_number
         digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
         case digits.size
         when 9
-          checksum = ((3 * (digits[0] + digits[3] + digits[6])) +
-                      (7 * (digits[1] + digits[4] + digits[7])) +
-                           (digits[2] + digits[5] + digits[8])) % 10
-          case checksum
-          when 0
-            true
+          if checksum(digits) == 0
+            return routing_number
           else
-            false
+            return routing_number[4..8] + routing_number[1..3]
           end
-        else
-          false
+        when 8
+          return routing_number
+        end
+      end
+
+      # Always return electronic-formatted routing number for Canadian routing numbers, US routing numbers unchanged
+      def electronic_format_routing_number
+        digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
+        case digits.size
+        when 9
+          return routing_number
+        when 8
+          return '0' + routing_number[5..7] + routing_number[0..4]
         end
       end
     end

data/lib/active_merchant/billing/compatibility.rb

@@ -28,7 +28,7 @@ module ActiveMerchant
       def self.humanize(lower_case_and_underscored_word)
         result = lower_case_and_underscored_word.to_s.dup
         result.gsub!(/_id$/, '')
-        result.gsub!(/_/, ' ')
+        result.tr!('_', ' ')
         result.gsub(/([a-z\d]*)/i, &:downcase).gsub(/^\w/) { $&.upcase }
       end
     end
@@ -56,7 +56,7 @@ module ActiveMerchant
         private
 
         def internal_errors
-          @errors ||= Errors.new
+          @internal_errors ||= Errors.new
         end
 
         class Errors < Hash
@@ -75,7 +75,7 @@ module ActiveMerchant
           end
 
           def empty?
-            all? { |k, v| v&.empty? }
+            all? { |_k, v| v&.empty? }
           end
 
           def on(field)
@@ -98,7 +98,8 @@ module ActiveMerchant
             result = []
 
             self.each do |key, messages|
-              next unless(messages && !messages.empty?)
+              next unless messages && !messages.empty?
+
               if key == 'base'
                 result << messages.first.to_s
               else

data/lib/active_merchant/billing/credit_card.rb

@@ -18,10 +18,27 @@ module ActiveMerchant #:nodoc:
     # * Dankort
     # * Maestro
     # * Forbrugsforeningen
+    # * Sodexo
+    # * Vr
+    # * Carnet
+    # * Synchrony
+    # * Routex
     # * Elo
     # * Alelo
     # * Cabal
     # * Naranja
+    # * UnionPay
+    # * Alia
+    # * Olimpica
+    # * Creditel
+    # * Confiable
+    # * Mada
+    # * BpPlus
+    # * Passcard
+    # * Edenred
+    # * Anda
+    # * Creditos directos (Tarjeta D)
+    # * Panal
     #
     # For testing purposes, use the 'bogus' credit card brand. This skips the vast majority of
     # validations, allowing you to focus on your core concerns until you're ready to be more concerned
@@ -51,6 +68,8 @@ module ActiveMerchant #:nodoc:
     class CreditCard < Model
       include CreditCardMethods
 
+      BRANDS_WITH_SPACES_IN_NUMBER = %w(bp_plus)
+
       class << self
         # Inherited, but can be overridden w/o changing parent's value
         attr_accessor :require_verification_value
@@ -66,7 +85,7 @@ module ActiveMerchant #:nodoc:
       attr_reader :number
 
       def number=(value)
-        @number = (empty?(value) ? value : value.to_s.gsub(/[^\d]/, ''))
+        @number = (empty?(value) ? value : filter_number(value))
       end
 
       # Returns or sets the expiry month for the card.
@@ -92,10 +111,27 @@ module ActiveMerchant #:nodoc:
       # * +'dankort'+
       # * +'maestro'+
       # * +'forbrugsforeningen'+
+      # * +'sodexo'+
+      # * +'vr'+
+      # * +'carnet'+
+      # * +'synchrony'+
+      # * +'routex'+
       # * +'elo'+
       # * +'alelo'+
       # * +'cabal'+
       # * +'naranja'+
+      # * +'union_pay'+
+      # * +'alia'+
+      # * +'olimpica'+
+      # * +'creditel'+
+      # * +'confiable'+
+      # * +'mada'+
+      # * +'bp_plus'+
+      # * +'passcard'+
+      # * +'edenred'+
+      # * +'anda'+
+      # * +'tarjeta-d'+
+      # * +'panal'+
       #
       # Or, if you wish to test your implementation, +'bogus'+.
       #
@@ -186,7 +222,7 @@ module ActiveMerchant #:nodoc:
         'contactless' => 'Data was read by a Contactless EMV kernel. Issuer script results are not available.',
         'contactless_magstripe' => 'Contactless data was read with a non-EMV protocol.',
         'contact' => 'Data was read using the EMV protocol. Issuer script results may follow.',
-        'contact_quickchip' => 'Data was read by the Quickchip EMV kernel. Issuer script results are not available.',
+        'contact_quickchip' => 'Data was read by the Quickchip EMV kernel. Issuer script results are not available.'
       }
 
       # Returns the ciphertext of the card's encrypted PIN.
@@ -317,8 +353,21 @@ module ActiveMerchant #:nodoc:
         icc_data.present?
       end
 
+      def allow_spaces_in_card?(number = nil)
+        BRANDS_WITH_SPACES_IN_NUMBER.include?(self.class.brand?(self.number || number))
+      end
+
       private
 
+      def filter_number(value)
+        regex = if allow_spaces_in_card?(value)
+                  /[^\d ]/
+                else
+                  /[^\d]/
+                end
+        value.to_s.gsub(regex, '')
+      end
+
       def validate_essential_attributes #:nodoc:
         errors = []
 
@@ -327,7 +376,7 @@ module ActiveMerchant #:nodoc:
           errors << [:last_name,  'cannot be empty'] if last_name.blank?
         end
 
-        if(empty?(month) || empty?(year))
+        if empty?(month) || empty?(year)
           errors << [:month, 'is required'] if empty?(month)
           errors << [:year,  'is required'] if empty?(year)
         else
@@ -336,7 +385,7 @@ module ActiveMerchant #:nodoc:
           if expired?
             errors << [:year,  'expired']
           else
-            errors << [:year,  'is not a valid year']  if !valid_expiry_year?(year)
+            errors << [:year,  'is not a valid year'] if !valid_expiry_year?(year)
           end
         end
 
@@ -347,7 +396,7 @@ module ActiveMerchant #:nodoc:
         errors = []
 
         if !empty?(brand)
-          errors << [:brand, 'is invalid']  if !CreditCard.card_companies.include?(brand)
+          errors << [:brand, 'is invalid'] if !CreditCard.card_companies.include?(brand)
         end
 
         if empty?(number)
@@ -367,9 +416,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/credit_card_formatting.rb

@@ -15,6 +15,7 @@ module ActiveMerchant #:nodoc:
         case option
         when :two_digits  then sprintf('%.2i', number.to_i)[-2..-1]
         when :four_digits then sprintf('%.4i', number.to_i)[-4..-1]
+        when :four_digits_year then number.to_s.length == 2 ? '20' + number.to_s : format(number, :four_digits)
         else number
         end
       end