From 829e413cb27bb1ad40edc206bfd3a25bbeae70ca Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 14 Jun 2016 11:27:16 -0700 Subject: [PATCH] Best-effort cardtype() when only the first two digits are available (identify 60xxxx as Discover) --- Changes | 2 ++ CreditCard.pm | 39 +++++++++++++++++++-------------------- MANIFEST | 1 + t/test.t | 1 + t/validate_card.t | 25 +++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 t/validate_card.t diff --git a/Changes b/Changes index e35a8e9..82d10f5 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,8 @@ Revision history for Perl extension Business::CreditCard. - Allow (and doc) import of receipt_cardtype - validate_card() is a new synonym for validate(), starting a long-term plan to stop exporting validate() or anything else by default. + - Best-effort cardtype() when only the first two digits are available + (identify 60xxxx as Discover) 0.35 Tue Feb 9 14:43:38 PST 2016 - Fix bug identifying 49* Visa cards introduced in 0.34, patch from diff --git a/CreditCard.pm b/CreditCard.pm index ed18b08..c9dcce3 100644 --- a/CreditCard.pm +++ b/CreditCard.pm @@ -9,7 +9,7 @@ $VERSION = "0.36_01"; @EXPORT = qw( cardtype validate generate_last_digit ); @EXPORT_OK = qw( receipt_cardtype validate_card ); -$EXPORT_TAGS{NEW} = qw( validate_card cardtype receipt_cardtype ); +$EXPORT_TAGS{NEW} = [ qw( validate_card cardtype receipt_cardtype ) ]; $Country = 'US'; @@ -63,11 +63,11 @@ cards are now recognized as "Discover card"). As of 0.30, cardtype() will accept a partial card masked with "x", "X', ".", "*" or "_". Only the first 2-6 digits and the length are significant; -whitespace and dashes are removed. To recognize just Visa, MasterCard and -Amex, you only need the first two digits; to recognize almost all cards -except some Switch cards, you need the first four digits, and to recognize -all cards including the remaining Switch cards, you need the first six -digits. +whitespace and dashes are removed. With two digits, Visa, MasterCard, Discover +and Amex are recognized (versions before 0.36 needed four digits to recognize +all Discover cards). With four digits, almost all cards except some +Switch cards are recognized. With six digits (the full "BIN" or "IIN"), all +cards are recognized. Six digits are also required for receipt_cardtype(). The generate_last_digit() subroutine computes and returns the last digit of the card given the preceding digits. With a 16-digit card, @@ -188,7 +188,8 @@ Waiting for 0.36+ to become more prevalent. Third: -Recommend new-style usage. +Recommend new-style usage. Maybe asking for a specific minimum version turns +it on too? Fourth: @@ -198,7 +199,8 @@ Don't export validate() (or anything else [separately?]) by default. This is the part that will break things and we probably won't do for a long time, until new-style usage is the norm and the tradeoff of breaking old code -is worth it to stop or namespace pollution. +is worth it to stop or namespace pollution. Maybe do a 1.00 releaes with the +current API and 2.00 is when this happens (with a 1.99_01 pre-release)? =head1 SEE ALSO @@ -252,15 +254,15 @@ sub cardtype { return "American Express card" if $number =~ /^3[47][\dx]{13}$/o; return "Discover card" - if $number =~ /^30[0-5][\dx]{13,16}$/o #diner's: 300-305 - || $number =~ /^3095[\dx]{12}$/o #diner's: 3095 - || $number =~ /^36[\dx]{12,17}$/o #diner's: 36 - || $number =~ /^3[89][\dx]{14,17}$/o #diner's: 38 and 39 - || $number =~ /^6011[\dx]{12,15}$/o - || $number =~ /^64[4-9][\dx]{13,16}$/o - || $number =~ /^65[\dx]{14,17}$/o - || ( $number =~ /^62[24-68][\dx]{13,16}$/o && $Country =~ /^(US|MX|AI|AG|AW|BS|BB|BM|BQ|VG|KY|CW|DM|DO|GD|GP|JM|MQ|MS|BL|KN|LC|VC|MF|SX|TT|TC)$/oi ) #China Union Pay identified as Discover in US, Mexico and Caribbean - || ( $number =~ /^35(2[89]|[3-8][\dx])[\dx]{12,15}$/o && $Country =~ /^(US|PR|VI|MP|PW|GU)$/oi ); #JCB cards in the 3528-3589 range are identified as Discover in US, Puerto Rico, US Virgin Islands, Northern Mariana Islands, Palau and Guam + if $number =~ /^30[0-5x][\dx]{13,16}$/o #diner's: 300-305, 30x + || $number =~ /^309[5x][\dx]{12}$/o # 3095, 309x + || $number =~ /^36[\dx]{12,17}$/o # 36 + || $number =~ /^3[89][\dx]{14,17}$/o # 38 and 39 + || $number =~ /^60[1x]{2}[\dx]{12,15}$/o #discover: 6011 601x 60xx + || $number =~ /^64[4-9x][\dx]{13,16}$/o # 644-649, 64x + || $number =~ /^65[\dx]{14,17}$/o # 65 + || ( $number =~ /^62[24-68x][\dx]{13,16}$/o && $Country =~ /^(US|MX|AI|AG|AW|BS|BB|BM|BQ|VG|KY|CW|DM|DO|GD|GP|JM|MQ|MS|BL|KN|LC|VC|MF|SX|TT|TC)$/oi ) #China Union Pay identified as Discover in US, Mexico and Caribbean + || ( $number =~ /^35(2[89x]|[3-8][\dx]|xx)[\dx]{12,15}$/o && $Country =~ /^(US|PR|VI|MP|PW|GU)$/oi ); #JCB cards in the 3528-3589 range are identified as Discover in US, Puerto Rico, US Virgin Islands, Northern Mariana Islands, Palau and Guam return "Switch" if $number =~ /^49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})[\dx]{10}([\dx]{2,3})?$/o @@ -269,9 +271,6 @@ sub cardtype { #redunant with above, catch 49* that's not Switch return "VISA card" if $number =~ /^4[\dx]{12,18}$/o; - #return "Diner's Club/Carte Blanche" - # if $number =~ /^3(0[0-59]|[68][\dx])[\dx]{11}$/o; - #"Diners Club enRoute" return "enRoute" if $number =~ /^2(014|149)[\dx]{11}$/o; diff --git a/MANIFEST b/MANIFEST index 770dbd8..c941470 100644 --- a/MANIFEST +++ b/MANIFEST @@ -8,3 +8,4 @@ META.yml t/test.t t/agreements.t t/validation.t +t/validate_card.t diff --git a/t/test.t b/t/test.t index 5a4cdec..6bd1f5b 100644 --- a/t/test.t +++ b/t/test.t @@ -40,6 +40,7 @@ sub test_card_identification { '6280xxxxxxxxxxxx' => 'Discover card', #China Union Pay '12345678' => 'Isracard', '123456780' => 'Isracard', + '60xx xxxx xxxx xxxx' => 'Discover card', #discover w/2 digits ); while( my ($k, $v)=each(%test_table) ){ if(cardtype($k) ne $v){ diff --git a/t/validate_card.t b/t/validate_card.t new file mode 100644 index 0000000..76fcca0 --- /dev/null +++ b/t/validate_card.t @@ -0,0 +1,25 @@ +#mostly just a quick test of validate_card() as the new name for validate() +# and the :NEW import tag to bring it in + +my @test_table=( + '4111 1111 1111 1111', + '5454 5454 5454 5454', +); + +my @bad_table=( + '4111 1111 1111 1112', + '5454 5454 5454 5455', +); + +use Test::More tests => 4; #haha no scalar(@test_table) + scalar(@bad_table); +use Business::CreditCard qw( :NEW ); + +foreach my $card (@test_table) { + ok( validate_card($card), "validate_card($card)" ); +} + +foreach my $card (@bad_table) { + ok( ! validate_card($card), "! validate_card($card)" ); +} + +1; -- 2.11.0