Support default fn values

Kikobeats · Apr 6, 2016 · a3517f6 · a3517f6
1 parent 829077a
commit a3517f6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -76,7 +76,12 @@ function Ardent (schemaBlueprint) {
 
       if (rule.required && !hasValue) throwError(name, schemaTypes[name])
 
-      var value = hasValue ? rule.type(obj[name]) : rule.default
+      var value
+
+      if (hasValue) value = rule.type(obj[name])
+      else if (typeof rule.default !== 'function') value = rule.default
+      else value = rule.default()
+
       objSchema[name] = applyFilters(value)
       return objSchema
     }, {})

diff --git a/test/index.js b/test/index.js
@@ -12,15 +12,28 @@ describe('schema defintion', function () {
     })
   })
 
-  it('support default value', function () {
-    var schema = {
-      age: {
-        type: Number, default: 23
+  describe('support default value', function () {
+    it('based in a value', function () {
+      var schema = {
+        age: {
+          type: Number, default: 23
+        }
       }
-    }
 
-    var ardent = Ardent(schema)
-    ardent().should.be.eql({age: 23})
+      var ardent = Ardent(schema)
+      ardent().should.be.eql({age: 23})
+    })
+
+    it('based in a fn', function () {
+      var schema = {
+        age: {
+          type: Number, default: function () { return 23 }
+        }
+      }
+
+      var ardent = Ardent(schema)
+      ardent().should.be.eql({age: 23})
+    })
   })
 
   it('support filters', function () {