add isFunction dep

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

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -23,6 +23,7 @@
 
 // TODO: Add strict mode
 
+var isFunction = require('lodash/isfunction')
 var reduce = require('lodash/reduce')
 var assign = require('lodash/assign')
 var flow = require('lodash/flow')
@@ -79,7 +80,7 @@ function Ardent (schemaBlueprint) {
       var value
 
       if (hasValue) value = rule.type(obj[name])
-      else if (typeof rule.default !== 'function') value = rule.default
+      else if (!isFunction(rule.default)) value = rule.default
       else value = rule.default()
 
       objSchema[name] = applyFilters(value)

diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "chaste": "~1.1.0",
     "lodash.assign": "~4.0.7",
     "lodash.flow": "~3.2.1",
+    "lodash.isfunction": "~3.0.8",
     "lodash.reduce": "~4.3.0",
     "whoops": "~2.0.1"
   },

diff --git a/test/index.js b/test/index.js
@@ -12,7 +12,7 @@ describe('schema defintion', function () {
     })
   })
 
-  describe('support default value', function () {
+  describe('support default values', function () {
     it('based in a value', function () {
       var schema = {
         age: {