Put model errors alongside field errors by validation name

Instead of a hash called __model with the model validation errors, the
model validation errors are now alongside the field validation keys of
the hash, named after the validation's key in the validate array. To be
as consistent as possible, the value is an array even though it will
only ever have one member. The structure is set to change in 2.0.

Example: where there was a model validation set up like

	validate: {
		xnor: function() {
			if (this.field1 === null) === (this.field2 === null) {
				throw new Error('require both or neither')
			}
		}
	}

and field1 and field2 have some validations, validate() might return
something like

	{
		field1: [
			'must be an email address',
			'email address must be @example.com'
		],
		xnor: ['require both or neither']
	}

lib/dao.js

@@ -276,10 +276,7 @@ module.exports = (function() {
       try {
       try {
         validator.apply(self)
         validator.apply(self)
       } catch (err) {
       } catch (err) {
-        if (!failures.hasOwnProperty('__model')) {
-          failures.__model = []
-        }
-        failures.__model.push(err.message)
+        failures[validatorType] = [err.message] // TODO: data structure needs to change for 2.0
       }
       }
     })
     })
 
 

spec/dao.validations.spec.js

@@ -330,7 +330,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       var failingFoo = Foo.build({ field1: null, field2: null })
       var failingFoo = Foo.build({ field1: null, field2: null })
         , errors     = failingFoo.validate()
         , errors     = failingFoo.validate()
       expect(errors).not.toBeNull()
       expect(errors).not.toBeNull()
-      expect(errors).toEqual({ '__model': ['xnor failed'] })
+      expect(errors).toEqual({ 'xnor': ['xnor failed'] })
 
 
       var successfulFoo = Foo.build({ field1: 33, field2: null })
       var successfulFoo = Foo.build({ field1: 33, field2: null })
       expect(successfulFoo.validate()).toBeNull()
       expect(successfulFoo.validate()).toBeNull()