fix(validate): default values should be added to the instance (#21)

* fix(validate): default values should be filled

* chore(package): version bump

Author: gjuchault

lib/model/util/validateSchema.js

@@ -13,11 +13,13 @@ const RequelizeError = require('../../error')
 function validateSchema (Model, instance) {
   return new Promise((resolve, reject) => {
     debug(`validating ${JSON.stringify(instance._data)}`)
-    Joi.validate(instance._data, Model._schema, (err) => {
+    Joi.validate(instance._data, Model._schema, (err, values) => {
       if (err) {
         return reject(new RequelizeError('ValidationError', err.details))
       }
 
+      Object.assign(instance._data, values)
+
       resolve()
     })
   })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "requelize",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "RethinkDB ORM",
   "main": "index.js",
   "repository": "https://github.com/buckless/requelize.git",

test/test.invalidSchema.js

@@ -1,11 +1,41 @@
 const Joi = require('joi')
 const { test, requelize, dropDb } = require('./utils')
 
+test('instance - default values', (t) => {
+  t.plan(1)
+
+  let Foo
+  let foo
+
+  dropDb()
+    .then(() => {
+      Foo = requelize.model('foo', {
+        name: Joi.string().default('bar')
+      })
+
+      return requelize.sync()
+    })
+    .then(() => {
+      foo = new Foo()
+
+      return foo.save()
+    })
+    .then((res) => {
+      t.equal('bar', res.name, 'default value')
+    })
+    .catch((err) => {
+      t.fail(err)
+    })
+    .then(() => {
+      t.end()
+    })
+})
+
 test('instance - invalid schema', (t) => {
   t.plan(1)
 
   let Foo
-  let inst
+  let foo
 
   dropDb()
     .then(() => {
@@ -20,11 +50,11 @@ test('instance - invalid schema', (t) => {
       return requelize.sync()
     })
     .then(() => {
-      inst = new Foo()
+      foo = new Foo()
 
-      inst.name = 2
+      foo.name = 2
 
-      return inst.save()
+      return foo.save()
     })
     .catch((err) => {
       t.equal('RequelizeError', err.name, 'joi validation error')

test/test.parse.js

@@ -79,7 +79,7 @@ test('no parsing', (t) => {
           .reduce((a, b) => a.add(b))
           .run()
           .then((res) => {
-            t.equal(2, res)
+            t.equal(2, res, 'map reduce working')
           })
     })
     .catch((err) => {