added support for array nested default functions

Author: emmoistner

lib/schema.js

@@ -174,10 +174,17 @@ Schema.prototype.validate = function (params, options) {
 };
 
 internals.invokeDefaultFunctions = function (data) {
-  return _.mapValues(data, function (val) {
+  var mapper;
+  if (_.isPlainObject(data)) {
+    mapper = _.mapValues;
+  } else {
+    mapper = _.map;
+  }
+
+  return mapper(data, function (val) {
     if(_.isFunction(val)) {
       return val.call(null);
-    } else if (_.isPlainObject(val)) {
+    } else if (_.isPlainObject(val) || _.isArray(val)) {
       return internals.invokeDefaultFunctions(val);
     } else {
       return val;

test/schema-test.js

@@ -470,6 +470,37 @@ describe('schema', function () {
       clock.restore();
     });
 
+    it('should return result of nested default functions', function () {
+      var clock = sinon.useFakeTimers(Date.now());
+
+      var config = {
+        hashKey : 'email',
+        schema : {
+          email   : Joi.string(),
+          created : Joi.date().default(Date.now),
+          properties : Joi.array().includes(Joi.object().keys({
+            created : Joi.date().default(Date.now),
+            name : Joi.string().default('Tim Testers property')
+          }))
+        }
+      };
+
+      var s = new Schema(config);
+
+      var d = s.applyDefaults({email: '[email protected]', properties: [ {} ] });
+
+      d.should.eql({
+        email : '[email protected]',
+        created : Date.now(),
+        properties : [{
+          created : Date.now(),
+          name : 'Tim Testers property'
+        }]
+      });
+
+      clock.restore();
+    });
+
   });
 
 });