Merge pull request #57 from benkiefer/master

switch the names of the properties on a record proxy to avoid collisi…

addon/models/filtered-record-array.js

@@ -9,8 +9,8 @@ export default RecordArray.extend({
     }),
 
     updateContent() {
-        var source = this.get("source");
-        var filter_func = this.get("filter_func");
+        var source = this.get("_source");
+        var filter_func = this.get("_filter_func");
 
         return Ember.A(source.filter(filter_func));
     },
@@ -21,7 +21,7 @@ export default RecordArray.extend({
     },
 
     _unregisterRecordArray() {
-        var store = this.get("store");
+        var store = this.get("_store");
         store._unsubscribe(this);
     }
 });

addon/models/record-array.js

@@ -3,20 +3,20 @@ import Ember from 'ember';
 const { ArrayProxy, computed } = Ember;
 
 export default ArrayProxy.extend({
-    store: null,
-    type: null,
+    _store: null,
+    _type: null,
 
     content: computed(function () {
-        return Ember.A(this.get("source"));
+        return Ember.A(this.get("_source"));
     }),
 
     push(data) {
-        var type = this.get('type');
-        return this.get('store').push(type, data);
+        var type = this.get('_type');
+        return this.get('_store').push(type, data);
     },
 
     remove(id) {
-        var type = this.get('type');
-        this.get('store').remove(type, id);
+        var type = this.get('_type');
+        this.get('_store').remove(type, id);
     }
 });

addon/models/record-proxy.js

@@ -4,18 +4,18 @@ import getOwner from 'ember-getowner-polyfill';
 const { computed } = Ember;
 
 export default Ember.ObjectProxy.extend({
-    source: null,
-    store: null,
-    type: null,
+    _source: null,
+    _store: null,
+    _type: null,
 
-    content: computed("source.[]", function() {
+    content: computed("_source.[]", function() {
         return this.compute();
     }),
 
     init() {
         this._super(...arguments);
-        const store = this.get('store');
-        const type = this.get('type');
+        const store = this.get('_store');
+        const type = this.get('_type');
 
         var model = getOwner(store).lookup(`model:${type}`);
 

addon/store.js

@@ -154,11 +154,11 @@ var Store = ServiceType.extend({
     },
     findOne(type) {
         return RecordProxy.create({
-            store: this,
-            type: type,
-            source: this._findAll(type),
+            _store: this,
+            _type: type,
+            _source: this._findAll(type),
             compute() {
-              return this.get("source").objectAt(0);
+              return this.get("_source").objectAt(0);
             }
         });
     },
@@ -171,18 +171,18 @@ var Store = ServiceType.extend({
     },
     _findAllProxy(type) {
         return RecordArray.create({
-            type: type,
-            store: this,
-            source: this._findAll(type)
+            _type: type,
+            _store: this,
+            _source: this._findAll(type)
         });
     },
     _findWithFilterFunc(type, filter_func) {
         var func = FilteredRecordArray.create({
-            type: type,
-            store: this,
-            id: Ember.uuid(),
-            filter_func: filter_func,
-            source: this._findAll(type)
+            _type: type,
+            _store: this,
+            _id: Ember.uuid(),
+            _filter_func: filter_func,
+            _source: this._findAll(type)
         });
         var filtersMap = this.get("filtersMap");
         var filters = filtersMap[type] || [];
@@ -202,13 +202,13 @@ var Store = ServiceType.extend({
         var primaryKey = primaryKeyForType(type, this);
 
         return RecordProxy.create({
-            store: this,
-            type: type,
-            filter_value: actualId,
-            source: this._findAll(type),
+            _store: this,
+            _type: type,
+            _filter_value: actualId,
+            _source: this._findAll(type),
             compute() {
-                var filter_value = this.get("filter_value");
-                return this.get("source").findBy(primaryKey, filter_value);
+                var filter_value = this.get("_filter_value");
+                return this.get("_source").findBy(primaryKey, filter_value);
             }
         });
     }

tests/acceptance/filters-test.js

@@ -78,7 +78,7 @@ test('filters can be thrown out when you navigate away from a given route', func
   });
 });
 
-test('filters on models with custom primary keys can be thrown out when you leave a route', function(assert) {
+test('xxx filters on models with custom primary keys can be thrown out when you leave a route', function(assert) {
   visit('/custom-key');
   andThen(function() {
       assert.equal(currentURL(), '/custom-key');

tests/unit/store-test.js

@@ -237,6 +237,23 @@ test("find with filter should return array of models filtered by value", functio
   assert.equal(store.find("person").get("length"), 5);
 });
 
+test("find with filter does not trump type property of object", function(assert) {
+  store.push("person", {
+    id: 9,
+    firstName: "Jarrod",
+    lastName: "Taylor",
+    source: "Jarrod's Mom",
+    store: "Walmart",
+    type: "developer"
+  });
+
+
+  var found = store.find("person", 9);
+    assert.equal(found.get("type"), "developer");
+    assert.equal(found.get("store"), "Walmart");
+    assert.equal(found.get("source"), "Jarrod's Mom");
+});
+
 test("find with filter should return array of models that tracks changes without asking for an update", function(assert) {
   store.push("person", {
     id: 9,