Fix broken validation and multiple custom

.npmignore

@@ -1,6 +1,7 @@
 bower_components/
 tests/
 tmp/
+dist/
 
 .bowerrc
 .editorconfig
@@ -9,5 +10,6 @@ tmp/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}

README.md

@@ -225,32 +225,53 @@ The value has to have only numeric values.
 ````
 
 ### Custom
-Define a custom callback funciton to validate the model's value. The validation callback is passed 3 values: the _key_, _value_, _model's scope_. return true (or a truthy value) to pass the validation, return false (or falsy value) to fail the validation.
+Define a custom callback function to validate the model's value. The validation callback is passed 3 values: the _key_, _value_, _model's scope_. return true (or a truthy value) to pass the validation, return false (or falsy value) to fail the validation.
 
 ````js
   validations: {
     lotteryNumber: {
-      custom: funciton(key, value, model){
+      custom: function(key, value, model){
         return model.get('accountBalance') > 1 ? true : false;
       }
     }
   }
 ````
 
-this has the same action as above except will use a custom message insetad of the default.
+this has the same action as above except will use a custom message instead of the default.
 ````js
   validations: {
     lotteryNumber: {
       custom: {
-        validation: funciton(key, value, model){
+        validation: function(key, value, model){
           return model.get('accountBalance') > 1 ? true : false;
         },
-        message: 'You can't win off of good looks and charm.'
+        message: 'You can\'t win off of good looks and charm.'
       }
     }
   }
 ````
 
+to have multiple custom validation functions on the same property, give 'custom' an array of either of the two syntax above.
+````js
+  validations: {
+    lotteryNumber: {
+      custom: [
+        {
+          validation: function(key, value, model){
+            return model.get('accountBalance') > 1 ? true : false;
+          },
+          message: 'You can\'t win off of good looks and charm.'
+        },
+        {
+          validation: function(key, value, model){
+            return model.get('accountBalance') > 1 ? true : false;
+          },
+          message: 'You can\'t win off of good looks and charm.'
+        }
+      ]
+    }
+  }
+````
 
 ### Password
 A set of validators which are especially useful for validating passwords. Be aware that these all of these password-aimed validations will work standalone and carry the same [common options](#common-options) with the rest of the validations. They don't only work for passwords!

addon/mixins/model-validator.js

@@ -37,7 +37,8 @@ export default Ember.Mixin.create({
       if(Object.keys(errors).length !== 0){
         var stateToTransition = this.get('isNew') ? 'created.uncommitted' : 'updated.uncommitted';
         this.transitionTo(stateToTransition);
-        store.recordWasInvalid(this, errors);
+				var recordModel = this.adapterDidInvalidate ? this : this._internalModel;
+        store.recordWasInvalid(recordModel, errors);
       }
       return false;
     }else{
@@ -47,14 +48,17 @@ export default Ember.Mixin.create({
 
   /**** Validators ****/
   _validateCustom: function(property, validation){
-    var customValidator = this._getCustomValidator(validation);
-    if (customValidator) {
-      var passedCustomValidation = customValidator(property, this.get(property), this);
-      if (!passedCustomValidation) {
-        this.set('isValidNow', false);
-        this._addToErrors(property, validation.custom, Messages.customValidationMessage);
-      }
-    }
+		validation = Ember.isArray(validation.custom) ? validation.custom : [validation.custom];
+		for (var i = 0; i < validation.length; i++) {
+	    var customValidator = this._getCustomValidator(validation[i]);
+	    if (customValidator) {
+	      var passedCustomValidation = customValidator(property, this.get(property), this);
+	      if (!passedCustomValidation) {
+	        this.set('isValidNow', false);
+	        this._addToErrors(property, validation[i], Messages.customValidationMessage);
+	      }
+	    }
+		}
   },
   _validatePresence: function(property, validation) {
     if (Ember.isBlank(this.get(property))){
@@ -248,10 +252,10 @@ export default Ember.Mixin.create({
     return validateThis;
   },
   _getCustomValidator: function(validation){
-    var customValidator = validation.custom;
-    if (Ember.typeOf(validation.custom) === 'object' && validation.custom.hasOwnProperty('validation')) {
-      customValidator = validation.custom.validation;
-    } 
+    var customValidator = validation;
+    if (Ember.typeOf(validation) === 'object' && validation.hasOwnProperty('validation')) {
+      customValidator = validation.validation;
+    }
     return typeof customValidator === 'function' ? customValidator : false;
   },
   _getCustomMessage: function(validationObj,defaultMessage) {

bower.json

@@ -1,14 +1,14 @@
 {
   "name": "ember-model-validator",
   "dependencies": {
-    "ember": "1.11.1",
+    "ember": "1.13.3",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.16.1",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-data": "1.13.5",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
     "ember-mocha": "~0.7.0",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0"
   }
-}
+}

config/ember-try.js

@@ -0,0 +1,35 @@
+module.exports = {
+  scenarios: [
+    {
+      name: 'default',
+      dependencies: { }
+    },
+    {
+      name: 'ember-release',
+      dependencies: {
+        'ember': 'components/ember#release'
+      },
+      resolutions: {
+        'ember': 'release'
+      }
+    },
+    // {
+    //   name: 'ember-beta',
+    //   dependencies: {
+    //     'ember': 'components/ember#beta'
+    //   },
+    //   resolutions: {
+    //     'ember': 'beta'
+    //   }
+    // },
+    // {
+    //   name: 'ember-canary',
+    //   dependencies: {
+    //     'ember': 'components/ember#canary'
+    //   },
+    //   resolutions: {
+    //     'ember': 'canary'
+    //   }
+    // }
+  ]
+};

ember-cli-build.js

@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};

package.json

@@ -19,18 +19,22 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.3",
-    "ember-cli-app-version": "0.3.3",
-    "ember-cli-dependency-checker": "0.0.8",
-    "ember-cli-htmlbars": "0.7.4",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli": "^1.13.1",
+    "ember-cli-app-version": "0.4.0",
+    "ember-cli-dependency-checker": "1.0.0",
+    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-mocha": "^0.6.1",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16.1",
+    "ember-cli-release": "0.2.3",
+    "ember-data": "1.13.5",
     "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.4"
+    "ember-try": "0.0.6"
   },
   "keywords": [
     "ember-addon",

tests/dummy/app/models/fake-model.js

@@ -34,6 +34,8 @@ export default DS.Model.extend(Validator,{
 
   otherFake: DS.belongsTo('other-model'),
 
+  thing: DS.attr(''),
+
   validations: {
     name: {
       presence: { errorAs:'profile.name' },
@@ -81,6 +83,20 @@ export default DS.Model.extend(Validator,{
       mustContainNumber: true,
       mustContainSpecial: true
     },
+    thing: {
+      custom: [
+        {
+          validation: function(key, value, _this){
+            return (value !== 'blahblahblahblahbthishouldneverfaillahblahblah');
+          }
+        },
+        {
+          validation: function(key, value, _this){
+            return (value !== 'fail');
+          }
+        }
+      ]
+    },
     mySubdomain:{
       subdomain:{ reserved:['admin','blog'], message: 'this subdomain is super invalid' }
     },
@@ -98,7 +114,7 @@ export default DS.Model.extend(Validator,{
     },
     lotteryNumber: {
       numericality: true,
-      custom: { 
+      custom: {
         validation: function(key, value, _this){
           var favColor = _this.get('favoriteColor');
           return !!favColor;

tests/unit/mixins/model-validator-test.js

@@ -76,6 +76,12 @@ describe('ModelValidatorMixin', function() {
         expect( model.get('errors').errorsFor('password').mapBy('message')[0][0] ).to.equal(Messages.customValidationMessage);
       });
 
+      it('validates the an array of custom validations', function(){
+        var model = this.subject({thing: 'fail'});
+        expect(model.validate()).to.equal(false);
+        expect( model.get('errors').errorsFor('thing').mapBy('message')[0][0] ).to.equal(Messages.customValidationMessage);
+      });
+
 		  it('validates the email format of the attributes set on `validations.email`', function() {
 	      var model = this.subject({email:'adsfasdf$'});
 	      expect(model.validate()).to.equal(false);