From ba28661bc715c73d777a77a5a23171aa41e8cd52 Mon Sep 17 00:00:00 2001 From: Eoin Nolan Date: Fri, 28 Oct 2016 11:47:49 -0700 Subject: [PATCH] Rename store and adapter --- ember-model.js | 40 +++++++++++------------ packages/ember-model/lib/belongs_to.js | 18 +++++----- packages/ember-model/lib/debug_adapter.js | 4 +-- packages/ember-model/lib/has_many.js | 6 ++-- packages/ember-model/lib/store.js | 10 +++--- packages/ember-model/tests/store_test.js | 8 ++--- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ember-model.js b/ember-model.js index f97c756..948a03a 100644 --- a/ember-model.js +++ b/ember-model.js @@ -1419,9 +1419,9 @@ function getType(record) { this.type = get(Ember.lookup, this.type); if (!this.type) { - var store = record.container.lookup('store:main'); - this.type = store.modelFor(type); - this.type.reopenClass({ adapter: store.adapterFor(type) }); + var emstore = record.container.lookup('emstore:main'); + this.type = emstore.modelFor(type); + this.type.reopenClass({ adapter: emstore.adapterFor(type) }); } } @@ -1481,7 +1481,7 @@ var get = Ember.get, function storeFor(record) { if (record.container) { - return record.container.lookup('store:main'); + return record.container.lookup('emstore:main'); } return null; @@ -1494,9 +1494,9 @@ function getType(record) { type = Ember.get(Ember.lookup, this.type); if (!type) { - var store = storeFor(record); - type = store.modelFor(this.type); - type.reopenClass({ adapter: store.adapterFor(this.type) }); + var emstore = storeFor(record); + type = emstore.modelFor(this.type); + type.reopenClass({ adapter: emstore.adapterFor(this.type) }); } } @@ -1524,8 +1524,8 @@ Ember.belongsTo = function(type, options) { } }; - var store = storeFor(this), - value = this.getBelongsTo(key, type, meta, store); + var emstore = storeFor(this), + value = this.getBelongsTo(key, type, meta, emstore); this._registerBelongsTo(meta); if (value !== null && meta.options.embedded) { value.get('isDirty'); // getter must be called before adding observer @@ -1584,7 +1584,7 @@ Ember.belongsTo = function(type, options) { }; Ember.Model.reopen({ - getBelongsTo: function(key, type, meta, store) { + getBelongsTo: function(key, type, meta, emstore) { var idOrAttrs = get(this, '_data.' + key), record; @@ -1598,8 +1598,8 @@ Ember.Model.reopen({ record = type.create({ isLoaded: false, id: id, container: this.container }); record.load(id, idOrAttrs); } else { - if (store) { - record = store._findSync(meta.type, idOrAttrs); + if (emstore) { + record = emstore._findSync(meta.type, idOrAttrs); } else { record = type.find(idOrAttrs); } @@ -2037,11 +2037,11 @@ var DebugAdapter = Ember.DataAdapter.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "data-adapter", + name: "em-data-adapter", initialize: function() { var application = arguments[1] || arguments[0]; - application.register('data-adapter:main', DebugAdapter); + application.register('em-data-adapter:main', DebugAdapter); } }); }); @@ -2112,16 +2112,16 @@ Ember.Model.Store = Ember.Object.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "store", + name: "emstore", initialize: function() { var application = arguments[1] || arguments[0]; - var store = application.Store || Ember.Model.Store; - application.register('store:application', store); - application.register('store:main', store); + var emstore = application.Store || Ember.Model.Store; + application.register('emstore:application', emstore); + application.register('emstore:main', emstore); - application.inject('route', 'store', 'store:main'); - application.inject('controller', 'store', 'store:main'); + application.inject('route', 'emstore', 'emstore:main'); + application.inject('controller', 'emstore', 'emstore:main'); } }); diff --git a/packages/ember-model/lib/belongs_to.js b/packages/ember-model/lib/belongs_to.js index 36e4751..013553a 100644 --- a/packages/ember-model/lib/belongs_to.js +++ b/packages/ember-model/lib/belongs_to.js @@ -4,7 +4,7 @@ var get = Ember.get, function storeFor(record) { if (record.container) { - return record.container.lookup('store:main'); + return record.container.lookup('emstore:main'); } return null; @@ -17,9 +17,9 @@ function getType(record) { type = Ember.get(Ember.lookup, this.type); if (!type) { - var store = storeFor(record); - type = store.modelFor(this.type); - type.reopenClass({ adapter: store.adapterFor(this.type) }); + var emstore = storeFor(record); + type = emstore.modelFor(this.type); + type.reopenClass({ adapter: emstore.adapterFor(this.type) }); } } @@ -47,8 +47,8 @@ Ember.belongsTo = function(type, options) { } }; - var store = storeFor(this), - value = this.getBelongsTo(key, type, meta, store); + var emstore = storeFor(this), + value = this.getBelongsTo(key, type, meta, emstore); this._registerBelongsTo(meta); if (value !== null && meta.options.embedded) { value.get('isDirty'); // getter must be called before adding observer @@ -107,7 +107,7 @@ Ember.belongsTo = function(type, options) { }; Ember.Model.reopen({ - getBelongsTo: function(key, type, meta, store) { + getBelongsTo: function(key, type, meta, emstore) { var idOrAttrs = get(this, '_data.' + key), record; @@ -121,8 +121,8 @@ Ember.Model.reopen({ record = type.create({ isLoaded: false, id: id, container: this.container }); record.load(id, idOrAttrs); } else { - if (store) { - record = store._findSync(meta.type, idOrAttrs); + if (emstore) { + record = emstore._findSync(meta.type, idOrAttrs); } else { record = type.find(idOrAttrs); } diff --git a/packages/ember-model/lib/debug_adapter.js b/packages/ember-model/lib/debug_adapter.js index 57384cf..cc82bc2 100644 --- a/packages/ember-model/lib/debug_adapter.js +++ b/packages/ember-model/lib/debug_adapter.js @@ -105,11 +105,11 @@ var DebugAdapter = Ember.DataAdapter.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "data-adapter", + name: "em-data-adapter", initialize: function() { var application = arguments[1] || arguments[0]; - application.register('data-adapter:main', DebugAdapter); + application.register('em-data-adapter:main', DebugAdapter); } }); }); diff --git a/packages/ember-model/lib/has_many.js b/packages/ember-model/lib/has_many.js index aa5652c..a2ee68c 100644 --- a/packages/ember-model/lib/has_many.js +++ b/packages/ember-model/lib/has_many.js @@ -8,9 +8,9 @@ function getType(record) { this.type = get(Ember.lookup, this.type); if (!this.type) { - var store = record.container.lookup('store:main'); - this.type = store.modelFor(type); - this.type.reopenClass({ adapter: store.adapterFor(type) }); + var emstore = record.container.lookup('emstore:main'); + this.type = emstore.modelFor(type); + this.type.reopenClass({ adapter: emstore.adapterFor(type) }); } } diff --git a/packages/ember-model/lib/store.js b/packages/ember-model/lib/store.js index f273129..a6f097f 100644 --- a/packages/ember-model/lib/store.js +++ b/packages/ember-model/lib/store.js @@ -59,16 +59,16 @@ Ember.Model.Store = Ember.Object.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "store", + name: "emstore", initialize: function() { var application = arguments[1] || arguments[0]; var store = application.Store || Ember.Model.Store; - application.register('store:application', store); - application.register('store:main', store); + application.register('emstore:application', store); + application.register('emstore:main', store); - application.inject('route', 'store', 'store:main'); - application.inject('controller', 'store', 'store:main'); + application.inject('route', 'emstore', 'emstore:main'); + application.inject('controller', 'emstore', 'emstore:main'); } }); diff --git a/packages/ember-model/tests/store_test.js b/packages/ember-model/tests/store_test.js index b001f26..c99ce5c 100644 --- a/packages/ember-model/tests/store_test.js +++ b/packages/ember-model/tests/store_test.js @@ -64,7 +64,7 @@ QUnit.module("Ember.Model.Store", { registry.register('model:test', TestModel); registry.register('model:embedded', EmbeddedModel); registry.register('model:uuid', UUIDModel); - registry.register('store:main', Ember.Model.Store); + registry.register('emstore:main', Ember.Model.Store); } }); @@ -224,11 +224,11 @@ QUnit.test("Registering a custom store on application works", function(assert) { }); container = App.__container__; - assert.ok(container.lookup('store:application')); - assert.ok(container.lookup('store:main').get('custom')); + assert.ok(container.lookup('emstore:application')); + assert.ok(container.lookup('emstore:main').get('custom')); var testRoute = container.lookup('route:test'); - assert.ok(testRoute.get('store.custom')); + assert.ok(testRoute.get('emstore.custom')); Ember.run(App, 'destroy'); });