separated extract with _extract

calidion · Apr 17, 2017 · 09882f0 · 09882f0
1 parent abe6588
commit 09882f0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -14,7 +14,7 @@ var validator = {
   validate: function (data, confs) {
     var params = validator._getParams(confs);
     var ignores = validator._getIgnores(confs);
-    var extracted = validator.extract(data, params);
+    var extracted = validator._extract(data, params);
     if (Object.keys(extracted).length <= 0) {
       return false;
     }
@@ -51,7 +51,11 @@ var validator = {
     }
     return params;
   },
-  extract: function (json, params) {
+  extract: function (json, confs) {
+    var params = validator._getParams(confs);
+    return this._extract(json, params);
+  },
+  _extract: function (json, params) {
     if (!json || !params) {
       return false;
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-form-validator",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "validator for objects, json, forms",
   "homepage": "https://github.com/calidion/node-form-validator",
   "author": {

diff --git a/test/extract.js b/test/extract.js
@@ -17,23 +17,23 @@ var data = {
 describe('#extract()', function () {
   var result;
   it('should return false when the data is not present', function () {
-    assert.equal(false, filter.extract(null, params));
+    assert.equal(false, filter._extract(null, params));
   });
 
   it('should return false when the params is not present', function () {
-    assert.equal(false, filter.extract(data));
+    assert.equal(false, filter._extract(data));
   });
 
   it('should return false when the req is not present', function () {
     assert.deepEqual({
       a: 100,
       b: 200,
       d: 300
-    }, filter.extract(data, params));
+    }, filter._extract(data, params));
   });
 
   it('should return true when all the params are present', function () {
-    result = filter.extract(data, params);
+    result = filter._extract(data, params);
     assert.deepEqual({
       a: 100,
       b: 200,
@@ -44,4 +44,25 @@ describe('#extract()', function () {
     result = filter.validate({}, {});
     assert.equal(false, result);
   });
+
+  it('should extract data', function () {
+    result = filter.extract(
+      {
+        a: '100',
+        b: 100
+      }, {
+        a: {
+          type: 'string',
+          required: true
+        },
+        b: {
+          type: 'int'
+        }
+      }
+    );
+    assert.deepEqual({
+      a: '100',
+      b: 100
+    }, result);
+  });
 });
diff --git a/test/result.js b/test/result.js
@@ -163,8 +163,7 @@ describe('#result()', function () {
         type: 'time'
       }
     };
-    var params = filter._getParams(confs);
-    var data1 = filter.extract(req1, params);
+    var data1 = filter.extract(req1, confs);
     assert.equal(true, data1.phone === '13181715210');
     assert.equal(true, data1.k3 === 'http://www.sina.com');
     assert.equal(true, Boolean(data1.k2));
@@ -221,8 +220,7 @@ describe('#result()', function () {
         type: 'time'
       }
     };
-    var params = filter._getParams(confs);
-    var data1 = filter.extract(req1, params);
+    var data1 = filter.extract(req1, confs);
     assert.deepEqual(data1, req1);
   });
 
@@ -237,8 +235,7 @@ describe('#result()', function () {
       }
     };
     assert(filter._validate(req1, confs));
-    var params = filter._getParams(confs);
-    var data1 = filter.extract(req1, params);
+    var data1 = filter.extract(req1, confs);
     assert.deepEqual(data1, req1);
   });