activemerchant 1.133.0 → 1.138.0

data/lib/active_merchant/billing/credit_card.rb

@@ -2,8 +2,8 @@ require 'time'
 require 'date'
 require 'active_merchant/billing/model'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # A +CreditCard+ object represents a physical credit card, and is capable of validating the various
     # data associated with these.
     #
@@ -39,6 +39,11 @@ module ActiveMerchant #:nodoc:
     # * Anda
     # * Creditos directos (Tarjeta D)
     # * Panal
+    # * Verve
+    # * Tuya
+    # * UATP
+    # * Patagonia365
+    # * Tarjeta Sol
     #
     # 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
@@ -132,6 +137,11 @@ module ActiveMerchant #:nodoc:
       # * +'anda'+
       # * +'tarjeta-d'+
       # * +'panal'+
+      # * +'verve'+
+      # * +'tuya'+
+      # * +'uatp'+
+      # * +'patagonia_365'+
+      # * +'tarjeta_sol'+
       #
       # Or, if you wish to test your implementation, +'bogus'+.
       #
@@ -288,7 +298,7 @@ module ActiveMerchant #:nodoc:
       end
 
       %w(month year start_month start_year).each do |m|
-        class_eval %(
+        class_eval <<~RUBY, __FILE__, __LINE__ + 1
           def #{m}=(v)
             @#{m} = case v
             when "", nil, 0
@@ -297,7 +307,7 @@ module ActiveMerchant #:nodoc:
               v.to_i
             end
           end
-        )
+        RUBY
       end
 
       def verification_value?
@@ -357,6 +367,18 @@ module ActiveMerchant #:nodoc:
         BRANDS_WITH_SPACES_IN_NUMBER.include?(self.class.brand?(self.number || number))
       end
 
+      def network_token?
+        false
+      end
+
+      def mobile_wallet?
+        false
+      end
+
+      def encrypted_wallet?
+        false
+      end
+
       private
 
       def filter_number(value)
@@ -368,7 +390,7 @@ module ActiveMerchant #:nodoc:
         value.to_s.gsub(regex, '')
       end
 
-      def validate_essential_attributes #:nodoc:
+      def validate_essential_attributes # :nodoc:
         errors = []
 
         if self.class.requires_name?
@@ -392,12 +414,10 @@ module ActiveMerchant #:nodoc:
         errors
       end
 
-      def validate_card_brand_and_number #:nodoc:
+      def validate_card_brand_and_number # :nodoc:
         errors = []
 
-        if !empty?(brand)
-          errors << [:brand, 'is invalid'] if !CreditCard.card_companies.include?(brand)
-        end
+        errors << [:brand, 'is invalid'] if !empty?(brand) && !CreditCard.card_companies.include?(brand)
 
         if empty?(number)
           errors << [:number, 'is required']
@@ -405,14 +425,12 @@ module ActiveMerchant #:nodoc:
           errors << [:number, 'is not a valid credit card number']
         end
 
-        if errors.empty?
-          errors << [:brand, 'does not match the card number'] if !CreditCard.matching_brand?(number, brand)
-        end
+        errors << [:brand, 'does not match the card number'] if errors.empty? && !CreditCard.matching_brand?(number, brand)
 
         errors
       end
 
-      def validate_verification_value #:nodoc:
+      def validate_verification_value # :nodoc:
         errors = []
 
         if verification_value?
@@ -423,18 +441,19 @@ module ActiveMerchant #:nodoc:
         errors
       end
 
-      class ExpiryDate #:nodoc:
+      class ExpiryDate # :nodoc:
         attr_reader :month, :year
+
         def initialize(month, year)
           @month = month.to_i
           @year = year.to_i
         end
 
-        def expired? #:nodoc:
+        def expired? # :nodoc:
           Time.now.utc > expiration
         end
 
-        def expiration #:nodoc:
+        def expiration # :nodoc:
           Time.utc(year, month, month_days, 23, 59, 59)
         rescue ArgumentError
           Time.at(0).utc

data/lib/active_merchant/billing/credit_card_formatting.rb

@@ -1,10 +1,21 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     module CreditCardFormatting
       def expdate(credit_card)
         "#{format(credit_card.month, :two_digits)}#{format(credit_card.year, :two_digits)}"
       end
 
+      def strftime_yyyymm(credit_card)
+        format(credit_card.year, :four_digits) + format(credit_card.month, :two_digits)
+      end
+
+      def strftime_yyyymmdd_last_day(credit_card)
+        year = credit_card.year.to_i
+        month = credit_card.month.to_i
+        last_day = Date.civil(year, month, -1).day
+        format(year, :four_digits) + format(month, :two_digits) + format(last_day, :two_digits)
+      end
+
       # This method is used to format numerical information pertaining to credit cards.
       #
       #   format(2005, :two_digits)  # => "05"

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -1,7 +1,7 @@
 require 'set'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # Convenience methods that can be included into a custom Credit Card object, such as an ActiveRecord based Credit Card object.
     module CreditCardMethods
       CARD_COMPANY_DETECTORS = {
@@ -24,7 +24,11 @@ module ActiveMerchant #:nodoc:
         },
         'maestro_no_luhn'    => ->(num) { num =~ /^(501080|501081|501082)\d{6,13}$/ },
         'forbrugsforeningen' => ->(num) { num =~ /^600722\d{10}$/ },
-        'sodexo'             => ->(num) { num =~ /^(606071|603389|606070|606069|606068|600818|505864|505865)\d{10}$/ },
+        'sodexo'             => lambda { |num|
+          num&.size == 16 && (
+            SODEXO_BINS.any? { |bin| num.slice(0, bin.size) == bin }
+          )
+        },
         'alia'               => ->(num) { num =~ /^(504997|505878|601030|601073|505874)\d{10}$/ },
         'vr'                 => ->(num) { num =~ /^(627416|637036)\d{10}$/ },
         'unionpay'           => ->(num) { (16..19).cover?(num&.size) && in_bin_range?(num.slice(0, 8), UNIONPAY_RANGES) },
@@ -39,7 +43,7 @@ module ActiveMerchant #:nodoc:
         'creditel' => ->(num) { num =~ /^601933\d{10}$/ },
         'confiable' => ->(num) { num =~ /^560718\d{10}$/ },
         'synchrony' => ->(num) { num =~ /^700600\d{10}$/ },
-        'routex' => ->(num) { num =~ /^(700676|700678)\d{13}$/ },
+        'routex' => ->(num) { num =~ /^(700674|700676|700678)\d{12,13}$/ },
         'mada' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), MADA_RANGES) },
         'bp_plus' => ->(num) { num =~ /^(7050\d\s\d{9}\s\d{3}$|705\d\s\d{8}\s\d{5}$)/ },
         'passcard' => ->(num) { num =~ /^628026\d{10}$/ },
@@ -47,7 +51,12 @@ module ActiveMerchant #:nodoc:
         'anda' => ->(num) { num =~ /^603199\d{10}$/ },
         'tarjeta-d' => ->(num) { num =~ /^601828\d{10}$/ },
         'hipercard' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), HIPERCARD_RANGES) },
-        'panal' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), PANAL_RANGES) }
+        'panal' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), PANAL_RANGES) },
+        'verve' => ->(num) { (16..19).cover?(num&.size) && in_bin_range?(num.slice(0, 6), VERVE_RANGES) },
+        'tuya' => ->(num) { num =~ /^588800\d{10}$/ },
+        'uatp' => ->(num) { num =~ /^(1175|1290)\d{11}$/ },
+        'patagonia_365' => ->(num) { num =~ /^504656\d{10}$/ },
+        'tarjeta_sol' => ->(num) { num =~ /^504639\d{10}$/ }
       }
 
       SODEXO_NO_LUHN = ->(num) { num =~ /^(505864|505865)\d{10}$/ }
@@ -72,6 +81,13 @@ module ActiveMerchant #:nodoc:
         (491730..491759),
       ]
 
+      SODEXO_BINS = Set.new(
+        %w[
+          606071 603389 606070 606069 606068 600818 505864 505865
+          60607601 60607607 60894400 60894410 60894420 60607606
+        ]
+      )
+
       CARNET_RANGES = [
         (506199..506499),
       ]
@@ -113,7 +129,8 @@ module ActiveMerchant #:nodoc:
             501500 501623
             501879 502113 502120 502121 502301
             503175 503337 503645 503670
-            504310 504338 504363 504533 504587 504620 504639 504656 504738 504781 504910
+            504310 504338 504363 504533 504587 504620 504738 504781 504910
+            505616
             507001 507002 507004 507082 507090
             560014 560565 561033
             572402 572610 572626
@@ -161,7 +178,7 @@ module ActiveMerchant #:nodoc:
         (501104..501105),
         (501107..501108),
         (501104..501105),
-        (501107..501108),
+        (501107..501109),
         (501800..501899),
         (502000..502099),
         (503800..503899),
@@ -221,7 +238,8 @@ module ActiveMerchant #:nodoc:
         58965700..58965799,
         60352200..60352299,
         65027200..65027299,
-        65008700..65008700
+        65008700..65008700,
+        65090000..65090099
       ]
 
       MADA_RANGES = [
@@ -236,7 +254,7 @@ module ActiveMerchant #:nodoc:
 
       # https://www.discoverglobalnetwork.com/content/dam/discover/en_us/dgn/pdfs/IPP-VAR-Enabler-Compliance.pdf
       UNIONPAY_RANGES = [
-        62000000..62000000, 62212600..62379699, 62400000..62699999, 62820000..62889999,
+        62000000..62000000, 62178570..62178570, 62212600..62379699, 62400000..62699999, 62820000..62889999,
         81000000..81099999, 81100000..81319999, 81320000..81519999, 81520000..81639999, 81640000..81719999
       ]
 
@@ -251,6 +269,43 @@ module ActiveMerchant #:nodoc:
 
       PANAL_RANGES = [[602049]]
 
+      VERVE_RANGES = [
+        [506099],
+        [506101],
+        [506103],
+        (506111..506114),
+        [506116],
+        [506118],
+        [506124],
+        [506127],
+        [506130],
+        (506132..506139),
+        [506141],
+        [506144],
+        (506146..506152),
+        (506154..506161),
+        (506163..506164),
+        [506167],
+        (506169..506198),
+        (507865..507866),
+        (507868..507872),
+        (507874..507899),
+        (507901..507909),
+        (507911..507919),
+        [507921],
+        (507923..507925),
+        (507927..507962),
+        [507964],
+        [627309],
+        [627903],
+        [628051],
+        [636625],
+        [637058],
+        [637634],
+        [639245],
+        [639383]
+      ]
+
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -324,9 +379,9 @@ module ActiveMerchant #:nodoc:
         # - http://www.beachnet.com/~hstiles/cardtype.html
         def valid_number?(number)
           valid_test_mode_card_number?(number) ||
-            valid_card_number_length?(number) &&
+            (valid_card_number_length?(number) &&
               valid_card_number_characters?(brand?(number), number) &&
-              valid_by_algorithm?(brand?(number), number)
+              valid_by_algorithm?(brand?(number), number))
         end
 
         def card_companies
@@ -386,20 +441,20 @@ module ActiveMerchant #:nodoc:
 
         private
 
-        def valid_card_number_length?(number) #:nodoc:
+        def valid_card_number_length?(number) # :nodoc:
           return false if number.nil?
 
           number.length >= 12
         end
 
-        def valid_card_number_characters?(brand, number) #:nodoc:
+        def valid_card_number_characters?(brand, number) # :nodoc:
           return false if number.nil?
           return number =~ /\A[0-9 ]+\Z/ if brand == 'bp_plus'
 
           !number.match(/\D/)
         end
 
-        def valid_test_mode_card_number?(number) #:nodoc:
+        def valid_test_mode_card_number?(number) # :nodoc:
           ActiveMerchant::Billing::Base.test? &&
             %w[1 2 3 success failure error].include?(number)
         end
@@ -408,10 +463,10 @@ module ActiveMerchant #:nodoc:
           SODEXO_NO_LUHN.call(numbers)
         end
 
-        def valid_by_algorithm?(brand, numbers) #:nodoc:
+        def valid_by_algorithm?(brand, numbers) # :nodoc:
           case brand
           when 'naranja'
-            valid_naranja_algo?(numbers)
+            valid_naranja_algo?(numbers) || valid_luhn?(numbers)
           when 'creditel'
             valid_creditel_algo?(numbers)
           when 'alia', 'confiable', 'maestro_no_luhn', 'anda', 'tarjeta-d', 'hipercard'
@@ -455,7 +510,7 @@ module ActiveMerchant #:nodoc:
         # Checks the validity of a card number by use of the Luhn Algorithm.
         # Please see http://en.wikipedia.org/wiki/Luhn_algorithm for details.
         # This implementation is from the luhn_checksum gem, https://github.com/zendesk/luhn_checksum.
-        def valid_luhn?(numbers) #:nodoc:
+        def valid_luhn?(numbers) # :nodoc:
           sum = 0
 
           odd = true
@@ -494,7 +549,7 @@ module ActiveMerchant #:nodoc:
         end
 
         # Checks the validity of a card number by use of specific algorithms
-        def valid_naranja_algo?(numbers) #:nodoc:
+        def valid_naranja_algo?(numbers) # :nodoc:
           num_array = numbers.to_s.chars.map(&:to_i)
           multipliers = [4, 3, 2, 7, 6, 5, 4, 3, 2, 7, 6, 5, 4, 3, 2]
           num_sum = num_array[0..14].zip(multipliers).map { |a, b| a * b }.reduce(:+)
@@ -503,7 +558,7 @@ module ActiveMerchant #:nodoc:
           final_num == num_array[15]
         end
 
-        def valid_creditel_algo?(numbers) #:nodoc:
+        def valid_creditel_algo?(numbers) # :nodoc:
           num_array = numbers.to_s.chars.map(&:to_i)
           multipliers = [5, 4, 3, 2, 1, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9]
           num_sum = num_array[0..14].zip(multipliers).map { |a, b| a * b }.reduce(:+)

data/lib/active_merchant/billing/gateway.rb

@@ -2,8 +2,8 @@ require 'net/http'
 require 'net/https'
 require 'active_merchant/billing/response'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     #
     # == Description
     # The Gateway class is the base class for all ActiveMerchant gateway implementations.
@@ -55,6 +55,7 @@ module ActiveMerchant #:nodoc:
     class Gateway
       include PostsData
       include CreditCardFormatting
+      include Versionable
 
       CREDIT_DEPRECATION_MESSAGE = 'Support for using credit to refund existing transactions is deprecated and will be removed from a future release of ActiveMerchant. Please use the refund method instead.'
       RECURRING_DEPRECATION_MESSAGE = 'Recurring functionality in ActiveMerchant is deprecated and will be removed in a future version. Please contact the ActiveMerchant maintainers if you have an interest in taking ownership of a separate gem that continues support for it.'
@@ -315,6 +316,25 @@ module ActiveMerchant #:nodoc:
         [first_name, last_name]
       end
 
+      def format_name(str = '')
+        return nil unless str.respond_to?(:force_encoding)
+
+        str = str.force_encoding('utf-8').encode
+        emoji_regex = /[\u{1f600}-\u{1f64f}\u{2702}-\u{27b0}\u{1f680}-\u{1f6ff}\u{24C2}-\u{1F251}\u{1f300}-\u{1f5ff}]/
+        emoticon_regex = /[:;=8xX]-?[)(DPpO3]/
+        str = str.gsub(emoji_regex, '').gsub(emoticon_regex, '').strip
+        I18n.transliterate(str).gsub(/[^\w\s]/, '')
+      end
+
+      def split_address(full_address)
+        address_parts = (full_address || '').split
+        return [nil, nil] if address_parts.size == 0
+
+        number = address_parts.shift
+        street = address_parts.join(' ')
+        [number, street]
+      end
+
       def requires!(hash, *params)
         params.each do |param|
           if param.is_a?(Array)