Merge branch 'master' of github.com:emberjs/data into remove-passing-…

…factories-to-store-methods
emberjs · Jun 3, 2015 · c3197d6 · c3197d6
2 parents f4cd218 + cf87126
commit c3197d6
Show file tree

Hide file tree

Showing 36 changed files with 464 additions and 222 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "ember-data",
   "private": true,
   "dependencies": {
-    "ember": "~1.11.1"
+    "ember": "~1.12.1"
   },
   "devDependencies": {
     "qunit": "~1.17.0",

diff --git a/packages/ember-data/lib/adapters/build-url-mixin.js b/packages/ember-data/lib/adapters/build-url-mixin.js
@@ -43,8 +43,8 @@ export default Ember.Mixin.create({
 
     @method buildURL
     @param {String} modelName
-    @param {String|Array|Object} id single id or array of ids or query
-    @param {DS.Snapshot|Array} snapshot single snapshot or array of snapshots
+    @param {(String|Array|Object)} id single id or array of ids or query
+    @param {(DS.Snapshot|Array)} snapshot single snapshot or array of snapshots
     @param {String} requestType
     @param {Object} query object of query parameters to send for findQuery requests.
     @return {String} url
@@ -136,7 +136,7 @@ export default Ember.Mixin.create({
   /**
    * @method urlForFindMany
    * @param {Array} ids
-   * @param {String} type
+   * @param {String} modelName
    * @param {Array} snapshots
    * @return {String} url
    */
@@ -200,7 +200,7 @@ export default Ember.Mixin.create({
     @method urlPrefix
     @private
     @param {String} path
-    @param {String} parentUrl
+    @param {String} parentURL
     @return {String} urlPrefix
   */
   urlPrefix: function(path, parentURL) {

diff --git a/packages/ember-data/lib/adapters/fixture-adapter.js b/packages/ember-data/lib/adapters/fixture-adapter.js
@@ -60,7 +60,7 @@ export default Adapter.extend({
     Implement this method in order to provide data associated with a type
 
     @method fixturesForType
-    @param {Subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @return {Array}
   */
   fixturesForType: function(typeClass) {
@@ -82,18 +82,18 @@ export default Adapter.extend({
     Implement this method in order to query fixtures data
 
     @method queryFixtures
-    @param {Array} fixture
+    @param {Array} fixtures
     @param {Object} query
-    @param {Subclass of DS.Model} typeClass
-    @return {Promise|Array}
+    @param {DS.Model} typeClass
+    @return {(Promise|Array)}
   */
   queryFixtures: function(fixtures, query, typeClass) {
     Ember.assert('Not implemented: You must override the DS.FixtureAdapter::queryFixtures method to support querying the fixture store.');
   },
 
   /**
     @method updateFixtures
-    @param {Subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {Array} fixture
   */
   updateFixtures: function(typeClass, fixture) {
@@ -113,7 +113,7 @@ export default Adapter.extend({
 
     @method mockJSON
     @param {DS.Store} store
-    @param {Subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {DS.Snapshot} snapshot
   */
   mockJSON: function(store, typeClass, snapshot) {
@@ -123,7 +123,6 @@ export default Adapter.extend({
   /**
     @method generateIdForRecord
     @param {DS.Store} store
-    @param {DS.Model} record
     @return {String} id
   */
   generateIdForRecord: function(store) {
@@ -133,7 +132,7 @@ export default Adapter.extend({
   /**
     @method find
     @param {DS.Store} store
-    @param {subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {String} id
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
@@ -158,7 +157,7 @@ export default Adapter.extend({
   /**
     @method findMany
     @param {DS.Store} store
-    @param {subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {Array} ids
     @param {Array} snapshots
     @return {Promise} promise
@@ -185,8 +184,7 @@ export default Adapter.extend({
     @private
     @method findAll
     @param {DS.Store} store
-    @param {subclass of DS.Model} typeClass
-    @param {String} sinceToken
+    @param {DS.Model} typeClass
     @return {Promise} promise
   */
   findAll: function(store, typeClass) {
@@ -203,9 +201,9 @@ export default Adapter.extend({
     @private
     @method findQuery
     @param {DS.Store} store
-    @param {subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {Object} query
-    @param {DS.AdapterPopulatedRecordArray} recordArray
+    @param {DS.AdapterPopulatedRecordArray} array
     @return {Promise} promise
   */
   findQuery: function(store, typeClass, query, array) {
@@ -225,7 +223,7 @@ export default Adapter.extend({
   /**
     @method createRecord
     @param {DS.Store} store
-    @param {subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
   */
@@ -242,7 +240,7 @@ export default Adapter.extend({
   /**
     @method updateRecord
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} typeClass
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
   */
@@ -259,7 +257,7 @@ export default Adapter.extend({
   /**
     @method deleteRecord
     @param {DS.Store} store
-    @param {subclass of DS.Model} typeClass
+    @param {DS.Model} typeClass
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
   */

diff --git a/packages/ember-data/lib/adapters/rest-adapter.js b/packages/ember-data/lib/adapters/rest-adapter.js
@@ -338,7 +338,7 @@ export default Adapter.extend(BuildURLMixin, {
 
     @method find
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {String} id
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
@@ -357,7 +357,7 @@ export default Adapter.extend(BuildURLMixin, {
     @private
     @method findAll
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {String} sinceToken
     @return {Promise} promise
   */
@@ -386,7 +386,7 @@ export default Adapter.extend(BuildURLMixin, {
     @private
     @method findQuery
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {Object} query
     @return {Promise} promise
   */
@@ -428,7 +428,7 @@ export default Adapter.extend(BuildURLMixin, {
 
     @method findMany
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {Array} ids
     @param {Array} snapshots
     @return {Promise} promise
@@ -521,7 +521,7 @@ export default Adapter.extend(BuildURLMixin, {
 
     @method createRecord
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
   */
@@ -547,7 +547,7 @@ export default Adapter.extend(BuildURLMixin, {
 
     @method updateRecord
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
   */
@@ -570,7 +570,7 @@ export default Adapter.extend(BuildURLMixin, {
 
     @method deleteRecord
     @param {DS.Store} store
-    @param {subclass of DS.Model} type
+    @param {DS.Model} type
     @param {DS.Snapshot} snapshot
     @return {Promise} promise
   */

diff --git a/packages/ember-data/lib/ember-initializer.js b/packages/ember-data/lib/ember-initializer.js
@@ -1,4 +1,6 @@
-import setupContainer from 'ember-data/setup-container';
+import { initializeInjects } from 'ember-data/setup-container';
+import initializeStoreService from 'ember-data/instance-initializers/initialize-store-service';
+
 
 var K = Ember.K;
 
@@ -42,11 +44,23 @@ Ember.onLoad('Ember.Application', function(Application) {
 
   Application.initializer({
     name:       "ember-data",
-    initialize: setupContainer
+    initialize: initializeInjects
   });
 
-  // Deprecated initializers to satisfy old code that depended on them
+  if (Application.instanceInitializer) {
+    Application.instanceInitializer({
+      name:       "ember-data",
+      initialize: initializeStoreService
+    });
+  } else {
+    Ember.initializer({
+      name:       "ember-data-store-service",
+      after:       "ember-data",
+      initialize: initializeStoreService
+    });
+  }
 
+  // Deprecated initializers to satisfy old code that depended on them
   Application.initializer({
     name:       "store",
     after:      "ember-data",

diff --git a/packages/ember-data/lib/initializers/store-injections.js b/packages/ember-data/lib/initializers/store-injections.js
@@ -6,7 +6,7 @@
   @param {Ember.Registry} registry
 */
 export default function initializeStoreInjections(registry) {
-  registry.injection('controller', 'store', 'store:main');
-  registry.injection('route', 'store', 'store:main');
-  registry.injection('data-adapter', 'store', 'store:main');
+  registry.injection('controller', 'store', 'store:application');
+  registry.injection('route', 'store', 'store:application');
+  registry.injection('data-adapter', 'store', 'store:application');
 }
diff --git a/packages/ember-data/lib/initializers/store.js b/packages/ember-data/lib/initializers/store.js
@@ -18,24 +18,20 @@ export default function initializeStore(registry, application) {
   registry.optionsForType('serializer', { singleton: false });
   registry.optionsForType('adapter', { singleton: false });
 
-  registry.register('store:main', registry.lookupFactory('store:application') || (application && application.Store) || Store);
+  registry.register('store:application', application && application.Store || Store);
 
   // allow older names to be looked up
 
   var proxy = new ContainerProxy(registry);
   proxy.registerDeprecations([
     { deprecated: 'serializer:_default',  valid: 'serializer:-default' },
     { deprecated: 'serializer:_rest',     valid: 'serializer:-rest' },
-    { deprecated: 'adapter:_rest',        valid: 'adapter:-rest' }
+    { deprecated: 'adapter:_rest',        valid: 'adapter:-rest' },
+    { deprecated: 'store:main',        valid: 'store:application' }
   ]);
 
   // new go forward paths
   registry.register('serializer:-default', JSONSerializer);
   registry.register('serializer:-rest', RESTSerializer);
   registry.register('adapter:-rest', RESTAdapter);
-
-  // Eagerly generate the store so defaultStore is populated.
-  // TODO: Do this in a finisher hook
-  var store = registry.lookup('store:main');
-  registry.register('service:store', store, { instantiate: false });
 }
diff --git a/packages/ember-data/lib/instance-initializers/initialize-store-service.js b/packages/ember-data/lib/instance-initializers/initialize-store-service.js
@@ -0,0 +1,26 @@
+/**
+ Configures a registry for use with an Ember-Data
+ store.
+
+ @method initializeStore
+ @param {Ember.ApplicationInstance} applicationOrRegistry
+ */
+export default function initializeStoreService(applicationOrRegistry) {
+  var registry, container;
+  if (applicationOrRegistry.registry && applicationOrRegistry.container) {
+    // initializeStoreService was registered with an
+    // instanceInitializer. The first argument is the application
+    // instance.
+    registry = applicationOrRegistry.registry;
+    container = applicationOrRegistry.container;
+  } else {
+    // initializeStoreService was called by an initializer instead of
+    // an instanceInitializer. The first argument is a registy. This
+    // case allows ED to support Ember pre 1.12
+    registry = applicationOrRegistry;
+    container = registry.container();
+  }
+  // Eagerly generate the store so defaultStore is populated.
+  var store = container.lookup('store:application');
+  registry.register('service:store', store, { instantiate: false });
+}
diff --git a/packages/ember-data/lib/serializers/embedded-records-mixin.js b/packages/ember-data/lib/serializers/embedded-records-mixin.js
@@ -113,9 +113,9 @@ var EmbeddedRecordsMixin = Ember.Mixin.create({
     }
     ```
    @method normalize
-   @param {subclass of DS.Model} typeClass
+   @param {DS.Model} typeClass
    @param {Object} hash to be normalized
-   @param {String} key the hash has been referenced by
+   @param {String} prop the hash has been referenced by
    @return {Object} the normalized hash
   **/
   normalize: function(typeClass, hash, prop) {