Merge pull request #75 from gnarf/ember-1.13

Ember 1.13

.editorconfig

@@ -0,0 +1,14 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Defaults for all types of files
+[*.{js,styl,css,hbs,html,json,yml}]
+indent_style = space
+indent_size = 2
+charset = utf-8

.gitignore

@@ -4,4 +4,5 @@ node_modules
 *.log
 tmp
 build
+dist
 docs

.jshintrc

@@ -41,6 +41,7 @@
   "plusplus": false,
   "regexp": false,
   "undef": true,
+  "unused": true,
   "sub": true,
   "strict": false,
   "white": false,

bower.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "jquery": "~1.11.1",
     "qunit": "~1.17.1",
-    "ember": "~1.10.0",
+    "ember": "~1.13.0",
     "orbit.js": "~0.6.0",
     "loader": "stefanpenner/loader.js#1.0.1"
   }

lib/ember-orbit/fields/attr.js

@@ -6,25 +6,23 @@ var attr = function(type, options) {
   options = options || {};
   options.type = type;
 
-  var meta = {
-    options: options,
-    isAttribute: true
-  };
-
-  return Ember.computed(function(key, value) {
-    if (arguments.length > 1) {
+  return Ember.computed({
+    get: function(key) {
+      return this.getAttribute(key);
+    },
+    set: function(key, value) {
       var oldValue = this.getAttribute(key);
 
       if (value !== oldValue) {
         this.patch(key, value);
       }
 
       return value;
-
-    } else {
-      return this.getAttribute(key);
     }
-  }).meta(meta);
+  }).meta({
+    options: options,
+    isAttribute: true
+  });
 };
 
 export default attr;

lib/ember-orbit/fields/has-many.js

@@ -7,14 +7,14 @@ var hasMany = function(model, options) {
   options.type = 'hasMany';
   options.model = model;
 
-  var meta = {
+  return Ember.computed({
+    get: function(key) {
+      return this.getLinks(key);
+    }
+  }).meta({
     options: options,
     isLink: true
-  };
-
-  return Ember.computed(function(key) {
-    return this.getLinks(key);
-  }).meta(meta).readOnly();
+  }).readOnly();
 };
 
 export default hasMany;

lib/ember-orbit/fields/has-one.js

@@ -15,11 +15,13 @@ var hasOne = function(model, options) {
     isLink: true
   };
 
-  return Ember.computed(function(key, value) {
-    var proxy = this.getLink(key);
-
-    if (arguments.length > 1) {
-      var currentValue = get(proxy, 'content');
+  return Ember.computed({
+    get: function(key) {
+      return this.getLink(key);
+    },
+    set: function(key, value) {
+      var proxy = this.getLink(key),
+          currentValue = get(proxy, 'content');
 
       if (value === null) {
         value = undefined;
@@ -33,11 +35,11 @@ var hasOne = function(model, options) {
         }
         set(proxy, 'content', value);
       }
-    }
-
-    return proxy;
 
+      return proxy;
+    }
   }).meta(meta);
+
 };
 
 export default hasOne;

lib/ember-orbit/fields/key.js

@@ -16,18 +16,18 @@ var key = function(type, options) {
     isKey: true
   };
 
-  return Ember.computed(function(name, value) {
-    if (arguments.length > 1) {
+  return Ember.computed({
+    get: function(name) {
+      return this.getKey(name);
+    },
+    set: function(name, value) {
       var oldValue = this.getKey(name);
 
       if (value !== oldValue) {
         this.patch(name, value);
       }
 
       return value;
-
-    } else {
-      return this.getKey(name);
     }
   }).meta(meta);
 };

lib/ember-orbit/links/has-many-array.js

@@ -5,10 +5,7 @@ import LinkProxyMixin from './link-proxy-mixin';
  @module ember-orbit
  */
 
-var get = Ember.get,
-    set = Ember.set;
-
-var forEach = Ember.EnumerableUtils.forEach;
+var get = Ember.get;
 
 /**
  A `HasManyArray` is a `RecordArray` that represents the contents of a has-many
@@ -20,7 +17,7 @@ var forEach = Ember.EnumerableUtils.forEach;
  */
 var HasManyArray = RecordArray.extend(LinkProxyMixin, {
 
-  arrayContentWillChange: function(index, removed, added) {
+  arrayContentWillChange: function(index, removed) {
     var store = get(this, 'store');
     var ownerType = get(this, '_ownerType');
     var ownerId = get(this, '_ownerId');

lib/ember-orbit/links/link-proxy-mixin.js

@@ -2,8 +2,7 @@
  @module ember-orbit
  */
 
-var get = Ember.get,
-    set = Ember.set;
+var get = Ember.get;
 
 var LinkProxyMixin = Ember.Mixin.create({
   store: null,

lib/ember-orbit/model.js

@@ -62,7 +62,7 @@ var Model = Ember.Object.extend(Ember.Evented, {
     var type = this.constructor.typeKey;
     var id = get(this, 'primaryId');
 
-    var relatedRecords = store.retrieveLinks(type, id, field) || Ember.A();
+    var relatedRecords = Ember.A(store.retrieveLinks(type, id, field) || []);
 
     var hasManyArray = HasManyArray.create({
       content: relatedRecords,

lib/ember-orbit/record-array-manager.js

@@ -5,10 +5,7 @@ import FilteredRecordArray from './record-arrays/filtered-record-array';
  @module ember-orbit
  */
 
-var get = Ember.get,
-    set = Ember.set;
-
-var forEach = Ember.EnumerableUtils.forEach;
+var get = Ember.get;
 
 /**
  @class RecordArrayManager
@@ -46,8 +43,7 @@ var RecordArrayManager = Ember.Object.extend({
 //    console.log('_processChange', record, operation);
 
     var path = operation.path,
-        op = operation.op,
-        value = operation.value;
+        op = operation.op;
 
     if (path.length === 2) {
       if (op === 'add') {
@@ -81,11 +77,10 @@ var RecordArrayManager = Ember.Object.extend({
     var recordArrays = record._recordArrays;
 
     if (recordArrays) {
-      recordArrays = recordArrays.toArray();
-
-      forEach(recordArrays, function(array) {
-        array.removeObject(record);
-      });
+      recordArrays.toArray()
+        .forEach(function(array) {
+          array.removeObject(record);
+        });
     }
 
     record.destroy();
@@ -97,7 +92,7 @@ var RecordArrayManager = Ember.Object.extend({
         filter;
 
     if (recordArrays) {
-      forEach(recordArrays, function(array) {
+      recordArrays.forEach(function(array) {
         filter = get(array, 'filterFunction');
         this.updateRecordArray(array, filter, type, record);
       }, this);

lib/ember-orbit/record-arrays/record-array.js

@@ -2,8 +2,7 @@
  @module ember-orbit
  */
 
-var get = Ember.get,
-    set = Ember.set;
+var get = Ember.get;
 
 var forEach = Ember.EnumerableUtils.forEach;
 

lib/ember-orbit/schema.js

@@ -1,6 +1,4 @@
 import OrbitSchema from 'orbit-common/schema';
-import key from 'ember-orbit/fields/key';
-import { uuid } from 'orbit/lib/uuid';
 
 /**
  @module ember-orbit
@@ -11,18 +9,26 @@ var get = Ember.get;
 var proxyProperty = function(source, property, defaultValue) {
   var _property = '_' + property;
 
-  return function(key, value) {
-    if (arguments.length > 1) {
-      this[_property] = value;
-      if (this[source]) {
-        this[source][property] = value;
+  return Ember.computed({
+    set: function(key, value) {
+      if (arguments.length > 1) {
+        this[_property] = value;
+        if (this[source]) {
+          this[source][property] = value;
+        }
       }
+      if (!this[_property]) {
+        this[_property] = defaultValue;
+      }
+      return this[_property];
+    },
+    get: function() {
+      if (!this[_property]) {
+        this[_property] = defaultValue;
+      }
+      return this[_property];
     }
-    if (!this[_property]) {
-      this[_property] = defaultValue;
-    }
-    return this[_property];
-  }.property();
+  });
 };
 
 var Schema = Ember.Object.extend({
@@ -109,7 +115,7 @@ var Schema = Ember.Object.extend({
     return this._schema.models[type].primaryKey.name;
   },
 
-  primaryKeyProperties: function(type, name) {
+  primaryKeyProperties: function(type) {
     return this._schema.models[type].primaryKey;
   },
 

lib/ember-orbit/source.js

@@ -1,4 +1,3 @@
-import Schema from './schema';
 import OCSource from 'orbit-common/source';
 
 /**
@@ -47,4 +46,4 @@ var Source = Ember.Object.extend({
   }
 });
 
-export default Source;
+export default Source;

lib/ember-orbit/store.js

@@ -1,14 +1,12 @@
 import Source from './source';
-import Model from './model';
 import RecordArrayManager from './record-array-manager';
 import OCMemorySource from 'orbit-common/memory-source';
 
 /**
  @module ember-orbit
  */
 
-var get = Ember.get,
-    set = Ember.set;
+var get = Ember.get;
 
 var RSVP = Ember.RSVP;
 
@@ -284,12 +282,10 @@ var Store = Source.extend({
     Ember.assert("`type` must be registered as a model in the container", get(this, 'schema').modelFor(type));
   },
 
-  _didTransform: function(operation, inverse) {
+  _didTransform: function(operation) {
 //    console.log('_didTransform', operation, inverse);
 
-    var op = operation.op,
-        path = operation.path,
-        value = operation.value,
+    var path = operation.path,
         record = this._lookupRecord(path[0], path[1]);
 
     if (path.length === 3) {

test/ember-env.js

@@ -0,0 +1 @@
+window.EmberENV = { EXTEND_PROTOTYPES: false };

test/index.html

@@ -7,6 +7,7 @@
 <body>
   <div id="qunit"></div>
   <div id="qunit-fixture"></div>
+  <script src="ember-env.js"></script>
   <script src="/assets/loader.js"></script>
   <script src="/assets/vendor.js"></script>
   <script src="/assets/qunit.js"></script>