Has many validator should work with simple arrays/objects

addon/index.js

@@ -134,7 +134,7 @@ export var validator = Validator;
  *
  * export default Ember.Route.extend({
  *   model() {
- *     User.create(
+ *     return User.create(
  *      getOwner(this).ownerInjection(),
  *      { username: 'John' }
  *     );

app/validators/belongs-to.js

@@ -13,14 +13,17 @@ const {
 
 
 /**
- *  Identifies a `belongs-to` relationship in an Ember Data Model. This is used to create a link to the validations object of the child model.
+ *  Identifies a `belongs-to` relationship in an Ember Data Model or Ember.Object.
+ *  This is used to create a link to the validations object of the child model.
  *
- *  _**Note:** Validations must exist on **both** models_
+ *  _**Note:** Validations must exist on **both** models/objects_
+ *
+ *  ### Ember Model
  *
  *  ```javascript
  *  // model/users.js
  *
- *  var Validations = buildValidations({
+ *  const Validations = buildValidations({
  *    details: validator('belongs-to')
  *  });
  *
@@ -32,7 +35,7 @@ const {
  *  ```javascript
  *  // model/user-details.js
  *
- *  var Validations = buildValidations({
+ *  const Validations = buildValidations({
  *    firstName: validator('presence', true),
  *    lastName: validator('presence', true)
  *  });
@@ -43,6 +46,28 @@ const {
  *  });
  *  ```
  *
+ *  ### Ember Object
+ *
+ *  ```javascript
+ *  // model/users.js
+ *
+ *  import UserDetails from '../user-details';
+ *
+ *  const Validations = buildValidations({
+ *    details: validator('belongs-to')
+ *  });
+ *
+ *  export default Ember.Object.extend(Validations, {
+ *    details: null,
+ *
+ *    init() {
+ *      this._super(...arguments);
+ *      let owner = Ember.getOwner(this);
+ *      this.set('details', UserDetails.create(owner.ownerInjection()));
+ *    }
+ *  });
+ *  ```
+ *
  *  From our `user` model, we can now check any validation propery on the `user-details` model.
  *
  *  ```javascript

app/validators/has-many.js

@@ -8,23 +8,39 @@ import Base from 'ember-cp-validations/validators/base';
 
 const {
   canInvoke,
-  A: emberArray
 } = Ember;
 
 /**
- *  Identifies a `has-many` relationship in an Ember Data Model. This is used to create a validation collection of the `has-many` validations.
+ *  Identifies a `has-many` relationship in an Ember Data Model or Ember.Object.
+ *  This is used to create a validation collection of the `has-many` validations.
  *
- *  _**Note:** Validations must exist on **all** models_
+ *  _**Note:** Validations must exist on **all** models/objects_
+ *
+ *  ### Ember Models
  *
  *  ```javascript
  *  // model/users.js
  *
- *  var Validations = buildValidations({
+ *  const Validations = buildValidations({
  *    friends: validator('has-many')
  *  });
  *
  *  export default DS.Model.extend(Validations, {
- *    'friends': DS.hasMany('user')
+ *    friends: DS.hasMany('user')
+ *  });
+ *  ```
+ *
+ *  ### Ember Objects
+ *
+ *  ```javascript
+ *  // model/users.js
+ *
+ *  const Validations = buildValidations({
+ *    friends: validator('has-many')
+ *  });
+ *
+ *  export default Ember.Object.extend(Validations, {
+ *    friends: null
  *  });
  *  ```
  *
@@ -44,10 +60,10 @@ export default Base.extend({
     if (value) {
       if (canInvoke(value, 'then')) {
         return value.then((models) => {
-          return emberArray(models).getEach('validations');
+          return models.map(m => m.get('validations'));
         });
       } else {
-        return value.toArray().getEach('validations');
+        return value.map(m => m.get('validations'));
       }
     }
 

tests/integration/validations/factory-general-test.js

@@ -6,7 +6,7 @@ import LengthValidator from 'dummy/validators/length';
 import { validator, buildValidations } from 'ember-cp-validations';
 import { moduleFor, test } from 'ember-qunit';
 
-var Validators = {
+const Validators = {
   presence(value, options, model, attr) {
     var isValid = !Ember.isNone(value);
     if (Ember.isNone(value)) {

tests/integration/validations/model-relationships-test.js

@@ -8,7 +8,7 @@ import PresenceValidator from 'dummy/validators/presence';
 import { validator, buildValidations } from 'ember-cp-validations';
 import { moduleFor, test } from 'ember-qunit';
 
-var Validators = {
+const Validators = {
   presence(value, options, model, attr) {
     var isValid = !Ember.isNone(value);
     if (Ember.isNone(value)) {
@@ -23,6 +23,14 @@ var Validations = buildValidations({
   lastName: validator(Validators.presence)
 });
 
+const BelongsToValidations = buildValidations({
+  friend: validator('belongs-to')
+});
+
+const HasManyValidations = buildValidations({
+  friends: validator('has-many')
+});
+
 moduleFor('foo', 'Integration | Validations | Model Relationships', {
   integration: true,
   beforeEach() {
@@ -33,10 +41,6 @@ moduleFor('foo', 'Integration | Validations | Model Relationships', {
 test("belong to validation - no cycle", function(assert) {
   this.register('validator:belongs-to', BelongsToValidator);
 
-  var BelongsToValidations = buildValidations({
-    friend: validator('belongs-to')
-  });
-
   var user2 = setupObject(this, Ember.Object.extend(Validations), {
     firstName: 'John'
   });
@@ -64,10 +68,6 @@ test("belong to validation - no cycle", function(assert) {
 test("belong to validation - with cycle", function(assert) {
   this.register('validator:belongs-to', BelongsToValidator);
 
-  var BelongsToValidations = buildValidations({
-    friend: validator('belongs-to')
-  });
-
   var user = setupObject(this, Ember.Object.extend(BelongsToValidations));
   user.set('friend', user);
 
@@ -87,13 +87,59 @@ test("belong to validation - with cycle", function(assert) {
 
 });
 
-test("has-many relationship is async", function(assert) {
-  this.register('validator:has-many', HasManyValidator);
+test("has-many relationship is sync", function(assert) {
+  this.register('validator:belongs-to', BelongsToValidator);
+
+  var friend = setupObject(this, Ember.Object.extend(Validations), {
+    firstName: 'John'
+  });
+
+  var user = setupObject(this, Ember.Object.extend(HasManyValidations), {
+    friends: [friend]
+  });
+
+  const {
+    validations,
+    model
+  } = user.get('validations').validateSync();
+
+  assert.equal(model, user, 'expected model to be the correct model');
+  assert.deepEqual(validations.get('content').getEach('attribute').sort(), ['friends'].sort());
+
+  let friends = validations.get('content').findBy('attribute', 'friends');
+
+  assert.equal(friends.get('isValid'), false);
+  assert.equal(friends.get('message'), 'lastName should be present');
+});
+
+test("has-many relationship is sync with proxy", function(assert) {
+  this.register('validator:belongs-to', BelongsToValidator);
 
-  var HasManyValidations = buildValidations({
-    friends: validator('has-many')
+  var friend = setupObject(this, Ember.Object.extend(Validations), {
+    firstName: 'John'
   });
 
+  var user = setupObject(this, Ember.Object.extend(HasManyValidations), {
+    friends: Ember.ArrayProxy.create({ content: Ember.A([friend]) })
+  });
+
+  const {
+    validations,
+    model
+  } = user.get('validations').validateSync();
+
+  assert.equal(model, user, 'expected model to be the correct model');
+  assert.deepEqual(validations.get('content').getEach('attribute').sort(), ['friends'].sort());
+
+  let friends = validations.get('content').findBy('attribute', 'friends');
+
+  assert.equal(friends.get('isValid'), false);
+  assert.equal(friends.get('message'), 'lastName should be present');
+});
+
+test("has-many relationship is async", function(assert) {
+  this.register('validator:has-many', HasManyValidator);
+
   var friend = setupObject(this, Ember.Object.extend(Validations), {
     firstName: 'Offir'
   });
@@ -126,10 +172,6 @@ test("has-many relationship is async", function(assert) {
 test("belongs-to relationship is async", function(assert) {
   this.register('validator:belongs-to', BelongsToValidator);
 
-  var BelongsToValidations = buildValidations({
-    friend: validator('belongs-to')
-  });
-
   var friend = setupObject(this, Ember.Object.extend(Validations), {
     firstName: 'Offir'
   });
@@ -163,10 +205,6 @@ test("belongs-to relationship is async", function(assert) {
 test("belongs-to relationship returns undefined", function(assert) {
   this.register('validator:belongs-to', BelongsToValidator);
 
-  var BelongsToValidations = buildValidations({
-    friend: validator('belongs-to')
-  });
-
   var user = setupObject(this, Ember.Object.extend(BelongsToValidations), {
     friend: new Ember.RSVP.Promise((resolve, reject) => {
       resolve({}); // validations object will be undefined