Fix isByteLength

validatorjs · Aug 3, 2015 · 09f0c6d · 09f0c6d
1 parent 7384f32
commit 09f0c6d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/test/validators.js b/test/validators.js
@@ -57,6 +57,7 @@ describe('Validators', function () {
               , 'invalid.com'
               , '@invalid.com'
               , '[email protected].'
+              , 'somename@ｇｍａｉｌ.com'
               , '[email protected].'
               , '[email protected]'
             ]
@@ -742,8 +743,8 @@ describe('Validators', function () {
     });
 
     it('should validate strings by byte length', function () {
-        test({ validator: 'isByteLength', args: [2], valid: ['abc', 'de', 'abcd'], invalid: [ '', 'a' ] });
-        test({ validator: 'isByteLength', args: [2, 3], valid: ['abc', 'de'], invalid: [ '', 'a', 'abcd' ] });
+        test({ validator: 'isByteLength', args: [2], valid: ['abc', 'de', 'abcd', 'ｇｍａｉｌ'], invalid: [ '', 'a' ] });
+        test({ validator: 'isByteLength', args: [2, 3], valid: ['abc', 'de', 'ｇ'], invalid: [ '', 'a', 'abcd', 'ｇｍ' ] });
     });
 
     it('should validate UUIDs', function () {

diff --git a/validator.js b/validator.js
@@ -435,7 +435,8 @@
     };
 
     validator.isByteLength = function (str, min, max) {
-        return str.length >= min && (typeof max === 'undefined' || str.length <= max);
+        var len = encodeURI(str).split(/%..|./).length - 1;
+        return len >= min && (typeof max === 'undefined' || len <= max);
     };
 
     validator.isUUID = function (str, version) {