Merge pull request #63 from guyskk/feat-validator-nstr

add nstr validator

src/validr/_validator_c.pyx

@@ -856,8 +856,7 @@ def float_validator(compiler, min=-sys.float_info.max, max=sys.float_info.max,
  return validate
 
 
-@validator(accept=(str, object), output=str)
-def str_validator(compiler, int minlen=0, int maxlen=1024 * 1024,
+def _str_validator(compiler, int minlen=0, int maxlen=1024 * 1024,
  bint strip=False, bint escape=False, str match=None,
  bint accept_object=False):
  """Validate string
@@ -904,6 +903,10 @@ def str_validator(compiler, int minlen=0, int maxlen=1024 * 1024,
  return validate
 
 
+str_validator = validator(accept=(str, object), output=str)(_str_validator)
+nstr_validator = validator(accept=object, output=object)(_str_validator)
+
+
 @validator(accept=bytes, output=bytes)
 def bytes_validator(compiler, int minlen=0, int maxlen=-1):
  """Validate bytes
@@ -1225,6 +1228,7 @@ builtin_validators = {
  'bool': bool_validator,
  'float': float_validator,
  'str': str_validator,
+ 'nstr': nstr_validator,
  'bytes': bytes_validator,
  'date': date_validator,
  'time': time_validator,

tests/validators/test_nstr.py

@@ -0,0 +1,28 @@
+from validr import T
+
+from . import case
+
+
+@case({
+ T.nstr: [
+ ('中文', '中文'),
+ ('123', '123'),
+ (0, '0'),
+ ('', ''),
+ [None, b'', b'abc', '中文'.encode('utf-8')]
+ ],
+ T.nstr.default('中文'): [
+ (None, '中文'),
+ ('', ''),
+ ('abc', 'abc')
+ ],
+ T.nstr.optional: [
+ ('中文', '中文'),
+ (0, '0'),
+ ('', ''),
+ (None, None),
+ [b'', b'abc']
+ ],
+})
+def test_nstr():
+ pass