fix for 13 digit visa cards, /o regex optimisation & fixed JCB regex

working test.pl
from Lee Lawrence <LeeL@aspin.co.uk>

diff --git a/CreditCard.pm b/CreditCard.pm
index b083411..1fe1108 100644 (file)
--- a/CreditCard.pm
+++ b/CreditCard.pm
@@ -81,6 +81,10 @@ orwant@tpj.com
 Current maintainer is Ivan Kohler <ivan-business-creditcard@420.am>.
 Please don't bother Jon with emails about this module.
 
+Lee Lawrence <LeeL@aspin.co.uk> and Neale Banks <neale@lowendale.com.au>
+contributed support for additional card types.  Lee also contributed a working
+test.pl.
+
 =cut
 
 @EXPORT = qw(cardtype validate generate_last_digit);
@@ -94,16 +98,15 @@ sub cardtype {
 
     return "Not a credit card" unless length($number) >= 13 && 0+$number;
 
-    return "VISA card" if $number =~ /^4\d{12}\d{3}?$/;
-    return "MasterCard" if $number =~ /^5[1-5]\d{14}$/;
-    return "Discover card" if $number =~ /^6011\d{12}$/;
-    return "American Express card" if $number =~ /^3[47]\d{13}/;
+    return "VISA card" if $number =~ /^4\d{12}(\d{3})?$/o;
+    return "MasterCard" if $number =~ /^5[1-5]\d{14}$/o;
+    return "Discover card" if $number =~ /^6011\d{12}$/o;
+    return "American Express card" if $number =~ /^3[47]\d{13}/o;
     return "Diner's Club/Carte Blanche"
-      if $number =~ /^3(0[0-5]|[68]\d)\d{11}$/;
-    return "enRoute" if $number =~ /^2(014|149)\d{11}$/;
-    return "JCB" if $number =~ /^3\d{15}$/
-                 || $number =~ /^(2131|1800)\d{11}$/;
-    return "BankCard" if $number =~ /^56(10\d\d|022[1-5])\d{10}$/;
+      if $number =~ /^3(0[0-5]|[68]\d)\d{11}$/o;
+    return "enRoute" if $number =~ /^2(014|149)\d{11}$/o;
+    return "JCB" if $number =~ /^(3\d{4}|2131|1800)\d{11}$/o;
+    return "BankCard" if $number =~ /^56(10\d\d|022[1-5])\d{10}$/o;
     return "Unknown";
 }
 

diff --git a/test.pl b/test.pl
index 60841eb..fcd547a 100644 (file)
--- a/test.pl
+++ b/test.pl
@@ -17,3 +17,43 @@ print "ok 1\n";
 # Insert your test code below (better if it prints "ok 13"
 # (correspondingly "not ok 13") depending on the success of chunk 13
 # of the test code):
+
+#test 2
+if( test_card_identification() ){ print "ok 2\n" }else{ print "not ok 2\n" }
+
+sub test_card_identification{
+        # 
+        # For the curious the table of test number aren't real credit card
+        # in fact they won't validate but they do obey the rule for the
+        # cardtype table to identify the card type.
+        #
+        my %test_table=(
+                '5212345678901234' =>   'MasterCard',
+                '5512345678901234' =>   'MasterCard',
+                '4123456789012' =>      'VISA card',
+                '4512345678901234' =>   'VISA card',
+                '341234567890123' =>    'American Express card',
+                '371234567890123' =>    'American Express card',
+                '30112345678901' =>     "Diner's Club/Carte Blanche",
+                '30512345678901' =>     "Diner's Club/Carte Blanche",
+                '36123456789012' =>     "Diner's Club/Carte Blanche",
+                '38123456789012' =>     "Diner's Club/Carte Blanche",
+                '201412345678901' =>    'enRoute',
+                '214912345678901' =>    'enRoute',
+                '6011123456789012' =>   'Discover card',
+                '3123456789012345' =>   'JCB',
+                '213112345678901' =>    'JCB',
+                '180012345678901' =>    'JCB',
+                '1800123456789012' =>   'Unknown',
+                '312345678901234' =>    'Unknown',
+        );
+        while( my ($k, $v)=each(%test_table) ){
+                if(cardtype($k) ne $v){
+                        print "Card $k - should be $v cardtpe returns ",cardtype
+($k),"\n";
+                        return;
+                }
+        }
+        return 1;
+}
+