joi - npm Package Compare versions

Comparing version 1.2.2 to 1.2.3

CONTRIBUTING.md

@@ -0,0 +0,0 @@ # How to contribute

languages/en-US.json

@@ -0,0 +0,0 @@ {

lib/errors.js

@@ -0,0 +0,0 @@ // Load modules

lib/index.js

@@ -38,2 +38,3 @@ // Load modules
     var settings = Utils.clone(exports.settings);
+    var localSettings = {};
 
@@ -47,3 +48,3 @@ if (!(config instanceof Types.Base)) {
             if (typeof config[name] === internals.joiConfig[name]) {
-                settings[name] = config[name];
+                localSettings[name] = settings[name] = config[name];
                 delete config[name];
@@ -136,3 +137,9 @@ }
 
+    var names = Object.keys(localSettings);
+    for (var i = 0, il = names.length; i < il; ++ i) {
+        var name = names[i];
+        config[name] = localSettings[name];
+    }
+
     return errors.toError();
 };

lib/messages.js

@@ -0,0 +0,0 @@ // Load modules

lib/set.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/any.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/array.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/base.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/boolean.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/email.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/function.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/index.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/number.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/object.js

@@ -0,0 +0,0 @@ // Load modules

lib/types/string.js

@@ -95,7 +95,6 @@ // Load modules
     Utils.assert(n >= 0, 'In Types.String.max(n), the n must be a non-negative integer');
-    this.__valids.remove(undefined);
 
     return function (value, obj, key, errors, keyPath) {
 
-        var result = value !== null && typeof value !== 'undefined' && (value.length <= n);
+        var result = value !== null && (value.length <= n);
         if (!result) {
@@ -102,0 +101,0 @@ errors.addLocalized('string.max', key, {

lib/utils.js

@@ -0,0 +0,0 @@ // Load modules

package.json

 {
   "name": "joi",
   "description": "Object schema validation",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "repository": "git://github.com/spumko/joi",
@@ -6,0 +6,0 @@ "main": "index",

README.md

@@ -0,0 +0,0 @@ <a href="https://github.com/spumko"><img src="https://raw.github.com/spumko/spumko/master/images/from.png" align="right" /></a>

test/index.js

@@ -586,2 +586,33 @@ // Load modules
 
+    it('should pass validation with extra keys set locally', function (done) {
+
+        expect(Joi.settings.stripExtraKeys).to.equal(false);
+
+        var localConfig = {
+            a: Joi.types.Number().min(0).max(3),
+            b: Joi.types.String().valid('a', 'b', 'c'),
+            allowExtraKeys: true
+        };
+
+        var obj = {
+            a: 1,
+            b: 'a',
+            d: 'c'
+        };
+        var err = Joi.validate(obj, localConfig);
+
+        expect(err).to.be.null;
+        expect(obj).to.deep.equal({a: 1, b: 'a', d: 'c'});
+        expect(Joi.settings.stripExtraKeys).to.equal(false);
+
+        err = Joi.validate(obj, localConfig);
+
+        expect(err).to.be.null;
+        expect(obj).to.deep.equal({a: 1, b: 'a', d: 'c'});
+        expect(Joi.settings.stripExtraKeys).to.equal(false);
+
+        done();
+    });
+
+
     it('should pass validation with extra keys and remove them when skipExtraKeys is set locally', function (done) {
@@ -609,2 +640,8 @@
 
+        err = Joi.validate(obj, localConfig);
+
+        expect(err).to.be.null;
+        expect(obj).to.deep.equal({a: 1, b: 'a'});
+        expect(Joi.settings.stripExtraKeys).to.equal(false);
+
         done();
@@ -611,0 +648,0 @@ });

test/languages/en-US.json

@@ -0,0 +0,0 @@ {

test/messages.js

@@ -0,0 +0,0 @@ // Load modules

test/set.js

@@ -0,0 +0,0 @@ // Load modules

test/support/meta.js

@@ -0,0 +0,0 @@ // Load modules

test/types/any.js

@@ -0,0 +0,0 @@ // Load modules

test/types/array.js

@@ -0,0 +0,0 @@ // Load modules

test/types/base.js

@@ -0,0 +0,0 @@ // Load modules

test/types/boolean.js

@@ -0,0 +0,0 @@ // Load modules

test/types/function.js

@@ -0,0 +0,0 @@ // Load modules

test/types/index.js

@@ -0,0 +0,0 @@ // Load modules

test/types/number.js

@@ -0,0 +0,0 @@ // Load modules

test/types/object.js

@@ -0,0 +0,0 @@ // Load modules

test/types/string.js

@@ -151,10 +151,2 @@ // Load modules
 
-        it('should invalid undefined if max set', function (done) {
-
-            var t = S().max(3);
-            verifyBehavior(t, [
-                [undefined, false]
-            ], done);
-        });
-
         it('should invalidate invalid values', function (done) {
@@ -226,2 +218,10 @@
 
+        it('should return true with max and not required when value is undefined', function (done) {
+
+            var t = S().max(3);
+            verifyBehavior(t, [
+                [undefined, true]
+            ], done);
+        });
+
         it('should validate regex', function (done) {
@@ -396,2 +396,13 @@
 
+        it('should handle combination of nullOk and max', function (done) {
+            var rule = S().nullOk().max(3);
+            verifyBehavior(rule, [
+                ['x', true],
+                ['123', true],
+                ['1234', false],
+                ['', false],
+                [null, true]
+            ], done);
+        });
+
         it('should handle combination of min and max', function (done) {
@@ -398,0 +409,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

3844

increased by1.08%

Worsened metrics

Total package byte prevSize

314468

decreased by-1.37%

No dependency changes