Make ISEMAIL and ISURL more flexible for longer TLD

sandbox/grist/functions/info.py

@@ -257,7 +257,8 @@ def ISTEXT(value):
   ([A-Za-z0-9]                    # Each part of hostname must start with alphanumeric
     ([A-Za-z0-9-]*[A-Za-z0-9])?\. # May have dashes inside, but end in alphanumeric
   )+
-  [A-Za-z]{2,6}$                  # Restrict top-level domain to length {2,6}. Google seems
+  [A-Za-z]{2,24}$                 # Restrict top-level domain to length {2,24} (theoretically,
+                                  # the max length is 63 bytes as per RFC 1034). Google seems
                                   # to use a whitelist for TLDs longer than 2 characters.
   """, re.UNICODE | re.VERBOSE)
 
@@ -289,7 +290,8 @@ def ISEMAIL(value):
   >>> ISEMAIL("[email protected]")
   False
 
-  More tests:
+  More tests:                                             Google Sheets   Grist
+                                                          -------------   -----
   >>> ISEMAIL("[email protected]")                              # True,     True
   True
   >>> ISEMAIL("[email protected]")                          # True,     True
@@ -314,6 +316,10 @@ def ISEMAIL(value):
   True
   >>> ISEMAIL("Bob_O'[email protected]")                 # False,    True
   True
+  >>> ISEMAIL("[email protected]")                          # False,    True
+  True
+  >>> ISEMAIL("[email protected]")                  # False,    True
+  False
   >>> ISEMAIL(u"фыва@mail.ru")                                # False,    True
   True
   >>> ISEMAIL("[email protected]")                             # True,     False
@@ -324,8 +330,6 @@ def ISEMAIL(value):
   False
   >>> ISEMAIL("[email protected]")                                   # True,     False
   False
-  >>> ISEMAIL("[email protected]")                  # False,    False
-  False
   >>> ISEMAIL("!def!xyz%[email protected]")                     # False,    False
   False
   >>> ISEMAIL("!#$%&'*+-/=?^_`.{|}[email protected]")             # False,    False
@@ -391,7 +395,7 @@ def ISEMAIL(value):
   ([A-Za-z0-9]                    # Each part of hostname must start with alphanumeric
     ([A-Za-z0-9-]*[A-Za-z0-9])?\. # May have dashes inside, but end in alphanumeric
   )+
-  [A-Za-z]{2,6}                   # Restrict top-level domain to length {2,6}. Google seems
+  [A-Za-z]{2,24}                   # Restrict top-level domain to length {2,24}. Google seems
                                   # to use a whitelist for TLDs longer than 2 characters.
   ([/?][-\w!#$%&'()*+,./:;=?@~]*)?$ # Notably, this excludes <, >, and ".
   """, re.VERBOSE)

test/common/gutil.js

@@ -247,6 +247,7 @@ describe('gutil', function() {
       assert.isTrue(gutil.isEmail('[email protected]'));
       assert.isTrue(gutil.isEmail('[email protected]'));
       assert.isTrue(gutil.isEmail('[email protected]'));
+      assert.isTrue(gutil.isEmail('[email protected]'));
 
       assert.isFalse(gutil.isEmail('plainaddress'));
       assert.isFalse(gutil.isEmail('@domain.com'));