Merge pull request #481 from ebryn/gj/ember-3.0

Ember 3.0

ember-model.js

@@ -1,6 +1,6 @@
 (function() {
 
-var VERSION = '2.18.0';
+var VERSION = '3.0.0-beta.1';
 
 if (Ember.libraries) {
   Ember.libraries.register('Ember Model', VERSION);
@@ -645,8 +645,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, {
     var relationships = this.constructor._relationships || [], meta = Ember.meta(this), relationshipKey, relationship, relationshipMeta, relationshipData, relationshipType;
     for (var i = 0, l = relationships.length; i < l; i++) {
       relationshipKey = relationships[i];
-      relationship = (meta.descs || this)[relationshipKey];
-      relationshipMeta = relationship.meta();
+      relationshipMeta = this.constructor.metaForProperty(relationshipKey);
 
       if (relationshipMeta.options.embedded) {
         relationshipType = relationshipMeta.type;

package.json

@@ -15,7 +15,7 @@
   "author": "no",
   "license": "MIT",
   "devDependencies": {
-    "ember-source": "2.18.2",
+    "ember-source": "3.0.0",
     "glob": "~3.2.1",
     "grunt": "~1.0.1",
     "grunt-contrib-clean": "~0.4.1",

packages/ember-model/lib/model.js

@@ -131,8 +131,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, {
     var relationships = this.constructor._relationships || [], meta = Ember.meta(this), relationshipKey, relationship, relationshipMeta, relationshipData, relationshipType;
     for (var i = 0, l = relationships.length; i < l; i++) {
       relationshipKey = relationships[i];
-      relationship = (meta.descs || this)[relationshipKey];
-      relationshipMeta = relationship.meta();
+      relationshipMeta = this.constructor.metaForProperty(relationshipKey);
 
       if (relationshipMeta.options.embedded) {
         relationshipType = relationshipMeta.type;

packages/ember-model/lib/version.js

@@ -1,4 +1,4 @@
-var VERSION = '2.18.0';
+var VERSION = '3.0.0-beta.1';
 
 if (Ember.libraries) {
   Ember.libraries.register('Ember Model', VERSION);

packages/ember-model/tests/filtered_record_array_test.js

@@ -30,7 +30,7 @@ QUnit.test("must be created with a filterFunction property", function(assert) {
 
 QUnit.test("must be created with a filterProperties property", function(assert) {
   assert.throws(function() {
-    Ember.FilteredRecordArray.create({modelClass: Model, filterFunction: Ember.K});
+    Ember.FilteredRecordArray.create({modelClass: Model, filterFunction: function() {} });
   }, /FilteredRecordArrays must be created with filterProperties/);
 });
 
@@ -42,7 +42,7 @@ QUnit.test("with a noop filter will return all the loaded records", function(ass
   Model.fetch().then(function() {
     var recordArray = Ember.FilteredRecordArray.create({
       modelClass: Model,
-      filterFunction: Ember.K,
+      filterFunction: function() { return true; },
       filterProperties: []
     });