Merge branch 'finboxio-master'

README.md

@@ -50,7 +50,7 @@ var schema = {
 var validator = osom(schema)
 
 // validate it!
-validator({age: '  23  '}) // => {age: '23'}
+validator({title: '  23  '}) // => {title: '23'}
 ```
 
 ## Usage

index.js

@@ -73,7 +73,7 @@ function Osom (schemaBlueprint, globalRules) {
       const isInvalidType = isCastingDisabled && !isSameType
       if (isInvalidType) throwTypeError(name, schemaTypes[name], rule.required)
 
-      if (rule.casting && hasValue) value = rule.type(obj[name])
+      if (hasValue) value = rule.casting ? rule.type(obj[name]) : obj[name]
       else if (rule.default) value = !isFunction(rule.default) ? rule.default : rule.default()
 
       // lodash.flow is buggy, this is a workaround (and dep-free)

test/index.js

@@ -117,44 +117,68 @@ describe('schema defintion', function () {
     })
   })
 
-  describe('support casting', function () {
+  describe('support casting by default', function () {
     it('enable (by default)', function () {
       var schema = { age: Array }
       var validator = osom(schema)
       validator({age: '23'}).should.be.eql({age: ['23']})
     })
+  })
 
-    it('disable explicit', function () {
+  describe('casting disabled explicitly', function () {
+    it('throw an error under different type provided', function () {
       var schema = {
         age: {
-          type: String,
-          casting: false
+          type: String
         }
       }
 
       var errMessage = "Expected {string} for 'age'."
-      var validator = osom(schema)
+      var validator = osom(schema, {casting: false})
 
       ;[{age: 23}].forEach(function (obj) {
         ;(function () { validator(obj) }).should.throw(errMessage)
       })
     })
 
-    it('disable explicit works with nill values', function () {
+    it('works with nill values of the same type', function () {
       [Number, String, Function, Boolean].forEach(function (type) {
         var schema = {
           age: {
-            type: type,
-            casting: false
+            type: type
           }
         }
 
-        var validator = osom(schema)
+        var validator = osom(schema, {casting: false})
         ;[null, {}, {age: null}].forEach(function (data) {
           validator(data).should.be.eql({})
         })
       })
     })
+
+    it('works with default value (not necessary of the same type defined)', function () {
+      var schema = {
+        age: {
+          type: String,
+          default: 23
+        }
+      }
+
+      var validator = osom(schema, { casting: false })
+      validator({}).should.be.eql({ age: 23 })
+    })
+
+    it('works with a value provided of the same type', function () {
+      var schema = {
+        age: {
+          type: String,
+          default: '24'
+        }
+      }
+
+      var validator = osom(schema, { casting: false })
+      validator({ age: '23' }).should.be.eql({ age: '23' })
+    })
   })
 
   describe('support validation', function () {