ember-data-source 2.5.0.beta.2 → 2.5.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9d7b3cd75782f3329927bde7511c099b3c99df
-  data.tar.gz: 64596218e86976d65b5b82575944116c5d8193a4
+  metadata.gz: 15e1481227df910e440b0197b8ccb2d87c6a69c6
+  data.tar.gz: 4a14e14326fc575175a6c84d89bf05ceb686607a
 SHA512:
-  metadata.gz: 0b4ddfc6ccebe6d73a0fb478d2974f647338b60e731ea7c70274cfa7c804226d62dd534603fc71c1d4dce8f4e1990a8dd4bee2aad0384fbec39fb0e152144b5e
-  data.tar.gz: ff4367d640a17f2fe70223474aefa0420bc69a42fe53f1b2c7e7852f1630b7d46501b4736b0a4b3a28bd8cc93409cb5e8c0a4e58409912837038022868dedeb6
+  metadata.gz: 1fbc70f08bc3ecda1d05a214037daa015e98f052da7f5d1afaba8a162a3d0660a3bf337f10fd8c6a96f38c57039d10f492ae0c053b94258600c71e99a440aefb
+  data.tar.gz: 51821ca18234ae5ab4af0b1d038a8c65ef337dd7f44f7328e5ec757002618cd64d04671cd60904c8ca032427045943512b732977d7b5e0a1a04b503cf48da33d

data/dist/globals/ember-data.js

@@ -6,7 +6,7 @@
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.5.0-beta.2
+ * @version   2.5.0-beta.3
  */
 
 var define, requireModule, require, requirejs;
@@ -2248,7 +2248,7 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
   var get = _ember.default.get;
   var set = _ember.default.set;
   var copy = _ember.default.copy;
-  var merge = _ember.default.merge;
+  var assign = _ember.default.assign || _ember.default.merge;
 
   var _extractPivotNameCache = new _emberDataPrivateSystemEmptyObject.default();
   var _splitOnDotCache = new _emberDataPrivateSystemEmptyObject.default();
@@ -2441,7 +2441,7 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
 
     setupData: function (data) {
       var changedKeys = this._changedKeys(data.attributes);
-      merge(this._data, data.attributes);
+      assign(this._data, data.attributes);
       this.pushedData();
       if (this.record) {
         this.record._notifyProperties(changedKeys);
@@ -2553,7 +2553,7 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
       var oldData = this._data;
       var currentData = this._attributes;
       var inFlightData = this._inFlightAttributes;
-      var newData = merge(copy(inFlightData), currentData);
+      var newData = assign(copy(inFlightData), currentData);
       var diffData = new _emberDataPrivateSystemEmptyObject.default();
 
       var newDataKeys = Object.keys(newData);
@@ -2889,9 +2889,9 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
       this.didCleanError();
       var changedKeys = this._changedKeys(data);
 
-      merge(this._data, this._inFlightAttributes);
+      assign(this._data, this._inFlightAttributes);
       if (data) {
-        merge(this._data, data);
+        assign(this._data, data);
       }
 
       this._inFlightAttributes = new _emberDataPrivateSystemEmptyObject.default();
@@ -3021,8 +3021,8 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
         var keys = Object.keys(updates);
         var length = keys.length;
 
-        original = merge(new _emberDataPrivateSystemEmptyObject.default(), this._data);
-        original = merge(original, this._inFlightAttributes);
+        original = assign(new _emberDataPrivateSystemEmptyObject.default(), this._data);
+        original = assign(original, this._inFlightAttributes);
 
         for (i = 0; i < length; i++) {
           key = keys[i];
@@ -5574,12 +5574,12 @@ define("ember-data/-private/system/record-arrays/record-array", ["exports", "emb
 /**
   @module ember-data
 */
-define('ember-data/-private/system/references', ['exports', '-private/system/references/record', '-private/system/references/belongs-to', '-private/system/references/has-many'], function (exports, _privateSystemReferencesRecord, _privateSystemReferencesBelongsTo, _privateSystemReferencesHasMany) {
-  exports.RecordReference = _privateSystemReferencesRecord.default;
-  exports.BelongsToReference = _privateSystemReferencesBelongsTo.default;
-  exports.HasManyReference = _privateSystemReferencesHasMany.default;
+define('ember-data/-private/system/references', ['exports', 'ember-data/-private/system/references/record', 'ember-data/-private/system/references/belongs-to', 'ember-data/-private/system/references/has-many'], function (exports, _emberDataPrivateSystemReferencesRecord, _emberDataPrivateSystemReferencesBelongsTo, _emberDataPrivateSystemReferencesHasMany) {
+  exports.RecordReference = _emberDataPrivateSystemReferencesRecord.default;
+  exports.BelongsToReference = _emberDataPrivateSystemReferencesBelongsTo.default;
+  exports.HasManyReference = _emberDataPrivateSystemReferencesHasMany.default;
 });
-define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-data/model', 'ember', '-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _emberDataModel, _ember, _privateSystemReferencesReference, _emberDataPrivateDebug) {
+define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-data/model', 'ember', 'ember-data/-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _emberDataModel, _ember, _emberDataPrivateSystemReferencesReference, _emberDataPrivateDebug) {
 
   var BelongsToReference = function (store, parentInternalModel, belongsToRelationship) {
     this._super$constructor(store, parentInternalModel);
@@ -5590,9 +5590,9 @@ define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-da
     // TODO inverse
   };
 
-  BelongsToReference.prototype = Object.create(_privateSystemReferencesReference.default.prototype);
+  BelongsToReference.prototype = Object.create(_emberDataPrivateSystemReferencesReference.default.prototype);
   BelongsToReference.prototype.constructor = BelongsToReference;
-  BelongsToReference.prototype._super$constructor = _privateSystemReferencesReference.default;
+  BelongsToReference.prototype._super$constructor = _emberDataPrivateSystemReferencesReference.default;
 
   BelongsToReference.prototype.remoteType = function () {
     if (this.belongsToRelationship.link) {
@@ -5664,7 +5664,7 @@ define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-da
 
   exports.default = BelongsToReference;
 });
-define('ember-data/-private/system/references/has-many', ['exports', 'ember', '-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _ember, _privateSystemReferencesReference, _emberDataPrivateDebug) {
+define('ember-data/-private/system/references/has-many', ['exports', 'ember', 'ember-data/-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _ember, _emberDataPrivateSystemReferencesReference, _emberDataPrivateDebug) {
 
   var get = _ember.default.get;
 
@@ -5677,9 +5677,9 @@ define('ember-data/-private/system/references/has-many', ['exports', 'ember', '-
     // TODO inverse
   };
 
-  HasManyReference.prototype = Object.create(_privateSystemReferencesReference.default.prototype);
+  HasManyReference.prototype = Object.create(_emberDataPrivateSystemReferencesReference.default.prototype);
   HasManyReference.prototype.constructor = HasManyReference;
-  HasManyReference.prototype._super$constructor = _privateSystemReferencesReference.default;
+  HasManyReference.prototype._super$constructor = _emberDataPrivateSystemReferencesReference.default;
 
   HasManyReference.prototype.remoteType = function () {
     if (this.hasManyRelationship.link) {
@@ -5769,7 +5769,7 @@ define('ember-data/-private/system/references/has-many', ['exports', 'ember', '-
 
   exports.default = HasManyReference;
 });
-define('ember-data/-private/system/references/record', ['exports', 'ember', '-private/system/references/reference'], function (exports, _ember, _privateSystemReferencesReference) {
+define('ember-data/-private/system/references/record', ['exports', 'ember', 'ember-data/-private/system/references/reference'], function (exports, _ember, _emberDataPrivateSystemReferencesReference) {
 
   var RecordReference = function (store, internalModel) {
     this._super$constructor(store, internalModel);
@@ -5777,9 +5777,9 @@ define('ember-data/-private/system/references/record', ['exports', 'ember', '-pr
     this._id = internalModel.id;
   };
 
-  RecordReference.prototype = Object.create(_privateSystemReferencesReference.default.prototype);
+  RecordReference.prototype = Object.create(_emberDataPrivateSystemReferencesReference.default.prototype);
   RecordReference.prototype.constructor = RecordReference;
-  RecordReference.prototype._super$constructor = _privateSystemReferencesReference.default;
+  RecordReference.prototype._super$constructor = _emberDataPrivateSystemReferencesReference.default;
 
   RecordReference.prototype.id = function () {
     return this._id;
@@ -7898,6 +7898,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
   var set = _ember.default.set;
   var once = _ember.default.run.once;
   var isNone = _ember.default.isNone;
+  var isPresent = _ember.default.isPresent;
   var Promise = _ember.default.RSVP.Promise;
   var copy = _ember.default.copy;
   var Store;
@@ -8091,6 +8092,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {DS.Model} record
     */
     createRecord: function (modelName, inputProperties) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's createRecord method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var typeClass = this.modelFor(modelName);
       var properties = copy(inputProperties) || new _emberDataPrivateSystemEmptyObject.default();
@@ -8250,6 +8252,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {Promise} promise
     */
     findRecord: function (modelName, id, options) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's findRecord method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       (0, _emberDataPrivateDebug.assert)(badIdFormatAssertion, typeof id === 'string' && id.length > 0 || typeof id === 'number' && !isNaN(id));
 
@@ -8323,6 +8326,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {Promise} promise
     */
     findByIds: function (modelName, ids) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's findByIds method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var promises = new Array(ids.length);
 
@@ -8508,6 +8512,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {DS.Model|null} record
     */
     peekRecord: function (modelName, id) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's peekRecord method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       if (this.hasRecordForId(modelName, id)) {
         return this._internalModelForId(modelName, id).getRecord();
@@ -8546,6 +8551,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {Boolean}
     */
     hasRecordForId: function (modelName, inputId) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's hasRecordForId method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var typeClass = this.modelFor(modelName);
       var id = (0, _emberDataPrivateSystemCoerceId.default)(inputId);
@@ -8563,6 +8569,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {DS.Model} record
     */
     recordForId: function (modelName, id) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's recordForId method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       return this._internalModelForId(modelName, id).getRecord();
     },
@@ -8677,7 +8684,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
     },
 
     _query: function (modelName, query, array) {
-      (0, _emberDataPrivateDebug.assert)("You need to pass a type to the store's query method", modelName);
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's query method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)("You need to pass a query hash to the store's query method", query);
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var typeClass = this.modelFor(modelName);
@@ -8705,7 +8712,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {Promise} promise
     */
     queryRecord: function (modelName, query) {
-      (0, _emberDataPrivateDebug.assert)("You need to pass a type to the store's queryRecord method", modelName);
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's queryRecord method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)("You need to pass a query hash to the store's queryRecord method", query);
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
 
@@ -8738,6 +8745,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {Promise} promise
     */
     findAll: function (modelName, options) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's findAll method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var typeClass = this.modelFor(modelName);
 
@@ -8802,6 +8810,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {DS.RecordArray}
     */
     peekAll: function (modelName) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's peekAll method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var typeClass = this.modelFor(modelName);
 
@@ -8894,6 +8903,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @deprecated
     */
     filter: function (modelName, query, filter) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's filter method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
 
       if (!_ember.default.ENV.ENABLE_DS_FILTER) {
@@ -8944,6 +8954,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {boolean}
     */
     recordIsLoaded: function (modelName, id) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's recordIsLoaded method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       return this.hasRecordForId(modelName, id);
     },
@@ -9192,6 +9203,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {DS.Model}
     */
     modelFor: function (modelName) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's modelFor method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
 
       var factory = this.modelFactoryFor(modelName);
@@ -9208,6 +9220,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
     },
 
     modelFactoryFor: function (modelName) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's modelFactoryFor method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var normalizedKey = (0, _emberDataPrivateSystemNormalizeModelName.default)(modelName);
 
@@ -9499,6 +9512,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {Object} The normalized payload
     */
     normalize: function (modelName, payload) {
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's normalize method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
       var serializer = this.serializerFor(modelName);
       var model = this.modelFor(modelName);
@@ -9587,7 +9601,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return DS.Adapter
     */
     adapterFor: function (modelName) {
-
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's adapterFor method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store.adapterFor has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
 
       return this.lookupAdapter(modelName);
@@ -9619,7 +9633,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       @return {DS.Serializer}
     */
     serializerFor: function (modelName) {
-
+      (0, _emberDataPrivateDebug.assert)("You need to pass a model name to the store's serializerFor method", isPresent(modelName));
       (0, _emberDataPrivateDebug.assert)('Passing classes to store.serializerFor has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
 
       var fallbacks = ['application', this.adapterFor(modelName).get('defaultSerializer'), '-default'];
@@ -9875,6 +9889,8 @@ define('ember-data/-private/system/store/common', ['exports', 'ember'], function
 define('ember-data/-private/system/store/container-instance-cache', ['exports', 'ember', 'ember-data/-private/system/empty-object'], function (exports, _ember, _emberDataPrivateSystemEmptyObject) {
   exports.default = ContainerInstanceCache;
 
+  var assign = _ember.default.assign || _ember.default.merge;
+
   /**
    * The `ContainerInstanceCache` serves as a lazy cache for looking up
    * instances of serializers and adapters. It has some additional logic for
@@ -9901,7 +9917,7 @@ define('ember-data/-private/system/store/container-instance-cache', ['exports',
 
   ContainerInstanceCache.prototype = new _emberDataPrivateSystemEmptyObject.default();
 
-  _ember.default.merge(ContainerInstanceCache.prototype, {
+  assign(ContainerInstanceCache.prototype, {
     get: function (type, preferredKey, fallbacks) {
       var cache = this._cache;
       var preferredLookupKey = type + ':' + preferredKey;
@@ -10150,7 +10166,6 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
       var record;
       store._adapterRun(function () {
         var payload = (0, _emberDataPrivateSystemStoreSerializerResponse.normalizeResponseHelper)(serializer, store, typeClass, adapterPayload, null, 'queryRecord');
-        (0, _emberDataPrivateDebug.assert)('`store.queryRecord` expected the adapter to return one record but the response from the adapter was empty.', payload.data);
         //TODO Optimize
         record = store.push(payload);
       });
@@ -13396,7 +13411,7 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
 
   var get = _ember.default.get;
   var isNone = _ember.default.isNone;
-  var merge = _ember.default.merge;
+  var assign = _ember.default.assign || _ember.default.merge;
 
   /**
     Ember Data 2.0 Serializer:
@@ -14378,7 +14393,7 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
       @param {Object} options
     */
     serializeIntoHash: function (hash, typeClass, snapshot, options) {
-      merge(hash, this.serialize(snapshot, options));
+      assign(hash, this.serialize(snapshot, options));
     },
 
     /**
@@ -14882,8 +14897,8 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
       var primaryHasTypeAttribute = (0, _emberDataPrivateUtils.modelHasAttributeOrRelationshipNamedType)(primaryModelClass);
       // Support polymorphic records in async relationships
       if (!primaryHasTypeAttribute && hash.type && store._hasModelFor(this.modelNameFromPayloadKey(hash.type))) {
-        serializer = store.serializerFor(hash.type);
-        modelClass = store.modelFor(hash.type);
+        serializer = store.serializerFor(this.modelNameFromPayloadKey(hash.type));
+        modelClass = store.modelFor(this.modelNameFromPayloadKey(hash.type));
       } else {
         serializer = primarySerializer;
         modelClass = primaryModelClass;
@@ -15522,32 +15537,32 @@ define('ember-data/transform', ['exports', 'ember'], function (exports, _ember)
   });
 });
 define("ember-data/version", ["exports"], function (exports) {
-  exports.default = "2.5.0-beta.2";
+  exports.default = "2.5.0-beta.3";
 });
-define("ember-inflector", ["exports", "ember", "lib/system", "lib/ext/string"], function (exports, _ember, _libSystem, _libExtString) {
+define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {
 
-  _libSystem.Inflector.defaultRules = _libSystem.defaultRules;
-  _ember.default.Inflector = _libSystem.Inflector;
+  _emberInflectorLibSystem.Inflector.defaultRules = _emberInflectorLibSystem.defaultRules;
+  _ember.default.Inflector = _emberInflectorLibSystem.Inflector;
 
-  _ember.default.String.pluralize = _libSystem.pluralize;
-  _ember.default.String.singularize = _libSystem.singularize;
+  _ember.default.String.pluralize = _emberInflectorLibSystem.pluralize;
+  _ember.default.String.singularize = _emberInflectorLibSystem.singularize;
 
-  exports.default = _libSystem.Inflector;
-  exports.pluralize = _libSystem.pluralize;
-  exports.singularize = _libSystem.singularize;
-  exports.defaultRules = _libSystem.defaultRules;
+  exports.default = _emberInflectorLibSystem.Inflector;
+  exports.pluralize = _emberInflectorLibSystem.pluralize;
+  exports.singularize = _emberInflectorLibSystem.singularize;
+  exports.defaultRules = _emberInflectorLibSystem.defaultRules;
 
   if (typeof define !== 'undefined' && define.amd) {
     define('ember-inflector', ['exports'], function (__exports__) {
-      __exports__['default'] = _libSystem.Inflector;
-      return _libSystem.Inflector;
+      __exports__['default'] = _emberInflectorLibSystem.Inflector;
+      return _emberInflectorLibSystem.Inflector;
     });
   } else if (typeof module !== 'undefined' && module['exports']) {
-    module['exports'] = _libSystem.Inflector;
+    module['exports'] = _emberInflectorLibSystem.Inflector;
   }
 });
 /* global define, module */
-define('ember-inflector/lib/ext/string', ['exports', 'ember', 'lib/system/string'], function (exports, _ember, _libSystemString) {
+define('ember-inflector/lib/ext/string', ['exports', 'ember', 'ember-inflector/lib/system/string'], function (exports, _ember, _emberInflectorLibSystemString) {
 
   if (_ember.default.EXTEND_PROTOTYPES === true || _ember.default.EXTEND_PROTOTYPES.String) {
     /**
@@ -15556,7 +15571,7 @@ define('ember-inflector/lib/ext/string', ['exports', 'ember', 'lib/system/string
       @for String
     */
     String.prototype.pluralize = function () {
-      return (0, _libSystemString.pluralize)(this);
+      return (0, _emberInflectorLibSystemString.pluralize)(this);
     };
 
     /**
@@ -15565,11 +15580,11 @@ define('ember-inflector/lib/ext/string', ['exports', 'ember', 'lib/system/string
       @for String
     */
     String.prototype.singularize = function () {
-      return (0, _libSystemString.singularize)(this);
+      return (0, _emberInflectorLibSystemString.singularize)(this);
     };
   }
 });
-define('ember-inflector/lib/helpers/pluralize', ['exports', 'ember-inflector', 'lib/utils/make-helper'], function (exports, _emberInflector, _libUtilsMakeHelper) {
+define('ember-inflector/lib/helpers/pluralize', ['exports', 'ember-inflector', 'ember-inflector/lib/utils/make-helper'], function (exports, _emberInflector, _emberInflectorLibUtilsMakeHelper) {
 
   /**
    *
@@ -15588,7 +15603,7 @@ define('ember-inflector/lib/helpers/pluralize', ['exports', 'ember-inflector', '
    * @param {Number|Property} [count] count of objects
    * @param {String|Property} word word to pluralize
   */
-  exports.default = (0, _libUtilsMakeHelper.default)(function (params) {
+  exports.default = (0, _emberInflectorLibUtilsMakeHelper.default)(function (params) {
     var count = undefined,
         word = undefined;
 
@@ -15607,7 +15622,7 @@ define('ember-inflector/lib/helpers/pluralize', ['exports', 'ember-inflector', '
     }
   });
 });
-define('ember-inflector/lib/helpers/singularize', ['exports', 'ember-inflector', 'lib/utils/make-helper'], function (exports, _emberInflector, _libUtilsMakeHelper) {
+define('ember-inflector/lib/helpers/singularize', ['exports', 'ember-inflector', 'ember-inflector/lib/utils/make-helper'], function (exports, _emberInflector, _emberInflectorLibUtilsMakeHelper) {
 
   /**
    *
@@ -15623,18 +15638,18 @@ define('ember-inflector/lib/helpers/singularize', ['exports', 'ember-inflector',
    * @method singularize
    * @param {String|Property} word word to singularize
   */
-  exports.default = (0, _libUtilsMakeHelper.default)(function (params) {
+  exports.default = (0, _emberInflectorLibUtilsMakeHelper.default)(function (params) {
     return (0, _emberInflector.singularize)(params[0]);
   });
 });
-define("ember-inflector/lib/system", ["exports", "lib/system/inflector", "lib/system/string", "lib/system/inflections"], function (exports, _libSystemInflector, _libSystemString, _libSystemInflections) {
+define("ember-inflector/lib/system", ["exports", "ember-inflector/lib/system/inflector", "ember-inflector/lib/system/string", "ember-inflector/lib/system/inflections"], function (exports, _emberInflectorLibSystemInflector, _emberInflectorLibSystemString, _emberInflectorLibSystemInflections) {
 
-  _libSystemInflector.default.inflector = new _libSystemInflector.default(_libSystemInflections.default);
+  _emberInflectorLibSystemInflector.default.inflector = new _emberInflectorLibSystemInflector.default(_emberInflectorLibSystemInflections.default);
 
-  exports.Inflector = _libSystemInflector.default;
-  exports.singularize = _libSystemString.singularize;
-  exports.pluralize = _libSystemString.pluralize;
-  exports.defaultRules = _libSystemInflections.default;
+  exports.Inflector = _emberInflectorLibSystemInflector.default;
+  exports.singularize = _emberInflectorLibSystemString.singularize;
+  exports.pluralize = _emberInflectorLibSystemString.pluralize;
+  exports.defaultRules = _emberInflectorLibSystemInflections.default;
 });
 define('ember-inflector/lib/system/inflections', ['exports'], function (exports) {
   exports.default = {
@@ -15952,14 +15967,14 @@ define('ember-inflector/lib/system/inflector', ['exports', 'ember'], function (e
 
   exports.default = Inflector;
 });
-define('ember-inflector/lib/system/string', ['exports', 'lib/system/inflector'], function (exports, _libSystemInflector) {
+define('ember-inflector/lib/system/string', ['exports', 'ember-inflector/lib/system/inflector'], function (exports, _emberInflectorLibSystemInflector) {
 
   function pluralize(word) {
-    return _libSystemInflector.default.inflector.pluralize(word);
+    return _emberInflectorLibSystemInflector.default.inflector.pluralize(word);
   }
 
   function singularize(word) {
-    return _libSystemInflector.default.inflector.singularize(word);
+    return _emberInflectorLibSystemInflector.default.inflector.singularize(word);
   }
 
   exports.pluralize = pluralize;