ember-data-source 1.13.9 → 1.13.10

data/dist/ember-data.prod.js

@@ -1,6 +1,7 @@
 (function() {
     "use strict";
     var ember$lib$main$$default = Ember;
+    var ember$data$lib$ext$ember$array$$default = Array.prorotype || ember$lib$main$$default.ArrayPolyfills;
     var ember$data$lib$system$object$polyfills$$keysFunc = Object.keys || Ember.keys;
     var ember$data$lib$system$object$polyfills$$create = Object.create || Ember.create;
 
@@ -8,8 +9,9 @@
       @class AdapterError
       @namespace DS
     */
+    var ember$data$lib$adapters$errors$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+
     var ember$data$lib$adapters$errors$$EmberError = Ember.Error;
-    var ember$data$lib$adapters$errors$$forEach = Ember.ArrayPolyfills.forEach;
     var ember$data$lib$adapters$errors$$SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
     function ember$data$lib$adapters$errors$$AdapterError(errors, message) {
       message = message || "Adapter operation failed";
@@ -129,7 +131,7 @@
               title: 'Invalid Attribute',
               detail: messages[i],
               source: {
-                pointer: "/data/attributes/" + key
+                pointer: '/data/attributes/' + key
               }
             });
           }
@@ -1120,7 +1122,7 @@
     */
     var ember$data$lib$adapters$rest$adapter$$get = Ember.get;
     var ember$data$lib$adapters$rest$adapter$$set = Ember.set;
-    var ember$data$lib$adapters$rest$adapter$$forEach = Ember.ArrayPolyfills.forEach;var ember$data$lib$adapters$rest$adapter$$RestAdapter = ember$data$lib$system$adapter$$default.extend(ember$data$lib$adapters$build$url$mixin$$default, {
+    var ember$data$lib$adapters$rest$adapter$$forEach = ember$data$lib$ext$ember$array$$default.forEach;var ember$data$lib$adapters$rest$adapter$$RestAdapter = ember$data$lib$system$adapter$$default.extend(ember$data$lib$adapters$build$url$mixin$$default, {
       defaultSerializer: '-rest',
 
       /**
@@ -1896,8 +1898,8 @@
     var ember$inflector$lib$lib$system$inflector$$capitalize = ember$lib$main$$default.String.capitalize;
 
     var ember$inflector$lib$lib$system$inflector$$BLANK_REGEX = /^\s*$/;
-    var ember$inflector$lib$lib$system$inflector$$LAST_WORD_DASHED_REGEX = /([\w/-]+[_/-])([a-z\d]+$)/;
-    var ember$inflector$lib$lib$system$inflector$$LAST_WORD_CAMELIZED_REGEX = /([\w/-]+)([A-Z][a-z\d]*$)/;
+    var ember$inflector$lib$lib$system$inflector$$LAST_WORD_DASHED_REGEX = /([\w/-]+[_/-\s])([a-z\d]+$)/;
+    var ember$inflector$lib$lib$system$inflector$$LAST_WORD_CAMELIZED_REGEX = /([\w/-\s]+)([A-Z][a-z\d]*$)/;
     var ember$inflector$lib$lib$system$inflector$$CAMELIZED_REGEX = /[A-Z][a-z\d]*$/;
 
     function ember$inflector$lib$lib$system$inflector$$loadUncountable(rules, uncountable) {
@@ -2136,7 +2138,7 @@
         @param {Object} irregular
       */
       inflect: function (word, typeRules, irregular) {
-        var inflection, substitution, result, lowercase, wordSplit, firstPhrase, lastWord, isBlank, isCamelized, rule;
+        var inflection, substitution, result, lowercase, wordSplit, firstPhrase, lastWord, isBlank, isCamelized, rule, isUncountable;
 
         isBlank = !word || ember$inflector$lib$lib$system$inflector$$BLANK_REGEX.test(word);
 
@@ -2155,10 +2157,10 @@
           lastWord = wordSplit[2].toLowerCase();
         }
 
-        for (rule in this.rules.uncountable) {
-          if (lowercase.match(rule + "$")) {
-            return word;
-          }
+        isUncountable = this.rules.uncountable[lowercase] || this.rules.uncountable[lastWord];
+
+        if (isUncountable) {
+          return word;
         }
 
         for (rule in this.rules.irregular) {
@@ -2497,7 +2499,7 @@
 
     var ember$data$lib$serializers$json$serializer$$get = Ember.get;
     var ember$data$lib$serializers$json$serializer$$isNone = Ember.isNone;
-    var ember$data$lib$serializers$json$serializer$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$serializers$json$serializer$$map = ember$data$lib$ext$ember$array$$default.map;
     var ember$data$lib$serializers$json$serializer$$merge = Ember.merge;
 
     /**
@@ -4277,8 +4279,7 @@
     var ember$data$lib$system$model$errors$$get = Ember.get;
     var ember$data$lib$system$model$errors$$set = Ember.set;
     var ember$data$lib$system$model$errors$$isEmpty = Ember.isEmpty;
-    var ember$data$lib$system$model$errors$$map = Ember.ArrayPolyfills.map;
-    var ember$data$lib$system$model$errors$$makeArray = Ember.makeArray;
+    var ember$data$lib$system$model$errors$$makeArray = Ember.makeArray;var ember$data$lib$system$model$errors$$map = ember$data$lib$ext$ember$array$$default.map;
 
     var ember$data$lib$system$model$errors$$default = Ember.ArrayProxy.extend(Ember.Evented, {
       /**
@@ -4587,10 +4588,10 @@
     */
 
     var ember$data$lib$system$model$model$$get = Ember.get;
-    var ember$data$lib$system$model$model$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$system$model$model$$indexOf = Ember.ArrayPolyfills.indexOf;
     var ember$data$lib$system$model$model$$merge = Ember.merge;
     var ember$data$lib$system$model$model$$copy = Ember.copy;
+    var ember$data$lib$system$model$model$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+    var ember$data$lib$system$model$model$$indexOf = ember$data$lib$ext$ember$array$$default.indexOf;
 
     function ember$data$lib$system$model$model$$intersection(array1, array2) {
       var result = [];
@@ -5389,8 +5390,8 @@
 
     var ember$data$lib$system$model$model$$default = ember$data$lib$system$model$model$$Model;
 
-    var ember$data$lib$system$store$serializer$response$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$system$store$serializer$response$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$system$store$serializer$response$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+    var ember$data$lib$system$store$serializer$response$$map = ember$data$lib$ext$ember$array$$default.map;
     var ember$data$lib$system$store$serializer$response$$get = Ember.get;
 
     /**
@@ -5725,8 +5726,8 @@
       return data;
     }
 
-    var ember$data$lib$serializers$rest$serializer$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$serializers$rest$serializer$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$serializers$rest$serializer$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+    var ember$data$lib$serializers$rest$serializer$$map = ember$data$lib$ext$ember$array$$default.map;
     var ember$data$lib$serializers$rest$serializer$$camelize = Ember.String.camelize;
     var ember$data$lib$serializers$rest$serializer$$get = Ember.get;
 
@@ -5905,6 +5906,8 @@
         @return {Object}
       */
       normalizeArray: function (store, modelName, arrayHash, prop) {
+        var _this = this;
+
         var documentHash = {
           data: [],
           included: []
@@ -5916,10 +5919,10 @@
         
         /*jshint loopfunc:true*/
         ember$data$lib$serializers$rest$serializer$$forEach.call(arrayHash, function (hash) {
-          var _serializer$normalize = serializer.normalize(modelClass, hash, prop);
+          var _normalizePolymorphicRecord = _this._normalizePolymorphicRecord(store, hash, prop, modelClass, serializer);
 
-          var data = _serializer$normalize.data;
-          var included = _serializer$normalize.included;
+          var data = _normalizePolymorphicRecord.data;
+          var included = _normalizePolymorphicRecord.included;
 
           documentHash.data.push(data);
           if (included) {
@@ -5932,7 +5935,21 @@
         return documentHash;
       },
 
-      /**
+      _normalizePolymorphicRecord: function (store, hash, prop, primaryModelClass, primarySerializer) {
+        var serializer = undefined,
+            modelClass = undefined;
+        // Support polymorphic records in async relationships
+        if (hash.type && store._hasModelFor(this.modelNameFromPayloadKey(hash.type))) {
+          serializer = store.serializerFor(hash.type);
+          modelClass = store.modelFor(hash.type);
+        } else {
+          serializer = primarySerializer;
+          modelClass = primaryModelClass;
+        }
+        return serializer.normalize(modelClass, hash, prop);
+      },
+
+      /*
         @method _normalizeResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -6005,10 +6022,10 @@
             ```
            */
           if (isPrimary && Ember.typeOf(value) !== 'array') {
-            var _normalize = this.normalize(primaryModelClass, value, prop);
+            var _normalizePolymorphicRecord2 = this._normalizePolymorphicRecord(store, value, prop, primaryModelClass, this);
 
-            var _data = _normalize.data;
-            var _included = _normalize.included;
+            var _data = _normalizePolymorphicRecord2.data;
+            var _included = _normalizePolymorphicRecord2.included;
 
             documentHash.data = _data;
             if (_included) {
@@ -6689,7 +6706,6 @@
 
       ember$data$lib$system$store$serializer$response$$pushPayload(store, documentHash);
     }
-
     /**
       @module ember-data
      */
@@ -7107,12 +7123,10 @@
       @namespace DS
       @extends DS.Adapter
     */
-    /**
-      @module ember-data
-    */
     var ember$data$lib$adapters$fixture$adapter$$get = Ember.get;
     var ember$data$lib$adapters$fixture$adapter$$fmt = Ember.String.fmt;
-    var ember$data$lib$adapters$fixture$adapter$$indexOf = Ember.ArrayPolyfills.indexOf;
+
+    var ember$data$lib$adapters$fixture$adapter$$indexOf = ember$data$lib$ext$ember$array$$default.indexOf;
 
     var ember$data$lib$adapters$fixture$adapter$$counter = 0;
 
@@ -7495,7 +7509,7 @@
     });
 
     var ember$data$lib$core$$DS = Ember.Namespace.create({
-      VERSION: '1.13.9'
+      VERSION: '1.13.10'
     });
 
     if (Ember.libraries) {
@@ -7551,7 +7565,7 @@
     }
 
     var ember$data$lib$system$store$finders$$Promise = Ember.RSVP.Promise;
-    var ember$data$lib$system$store$finders$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$system$store$finders$$map = ember$data$lib$ext$ember$array$$default.map;
     var ember$data$lib$system$store$finders$$get = Ember.get;
 
     function ember$data$lib$system$store$finders$$_find(adapter, store, typeClass, id, internalModel, options) {
@@ -8124,9 +8138,10 @@
     };
 
     var ember$data$lib$system$ordered$set$$default = ember$data$lib$system$ordered$set$$OrderedSet;
+
     var ember$data$lib$system$record$array$manager$$get = Ember.get;
-    var ember$data$lib$system$record$array$manager$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$system$record$array$manager$$indexOf = Ember.ArrayPolyfills.indexOf;
+    var ember$data$lib$system$record$array$manager$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+    var ember$data$lib$system$record$array$manager$$indexOf = ember$data$lib$ext$ember$array$$default.indexOf;
 
     var ember$data$lib$system$record$array$manager$$default = Ember.Object.extend({
       init: function () {
@@ -9297,7 +9312,7 @@
 
     var ember$data$lib$system$model$states$$default = ember$data$lib$system$model$states$$RootState;
 
-    var ember$data$lib$system$relationships$state$relationship$$forEach = Ember.ArrayPolyfills.forEach;
+    var ember$data$lib$system$relationships$state$relationship$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
 
     function ember$data$lib$system$relationships$state$relationship$$Relationship(store, record, inverseKey, relationshipMeta) {
       this.members = new ember$data$lib$system$ordered$set$$default();
@@ -9545,7 +9560,7 @@
 
     var ember$data$lib$system$many$array$$get = Ember.get;
     var ember$data$lib$system$many$array$$set = Ember.set;
-    var ember$data$lib$system$many$array$$filter = Ember.ArrayPolyfills.filter;
+    var ember$data$lib$system$many$array$$filter = ember$data$lib$ext$ember$array$$default.filter;
 
     var ember$data$lib$system$many$array$$default = Ember.Object.extend(Ember.MutableArray, Ember.Evented, {
       init: function () {
@@ -9678,7 +9693,7 @@
           records = this.currentState.slice(idx, idx + amt);
           this.get('relationship').removeRecords(records);
         }
-        var map = objects.map || Ember.ArrayPolyfills.map;
+        var map = objects.map || ember$data$lib$ext$ember$array$$default.map;
         if (objects) {
           this.get('relationship').addRecords(map.call(objects, function (obj) {
             return obj._internalModel;
@@ -9828,7 +9843,7 @@
       return typeClass.detect(addedRecord.type);
     }
 
-    var ember$data$lib$system$relationships$state$has$many$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$system$relationships$state$has$many$$map = ember$data$lib$ext$ember$array$$default.map;
 
     var ember$data$lib$system$relationships$state$has$many$$ManyRelationship = function (store, record, inverseKey, relationshipMeta) {
       this._super$constructor(store, record, inverseKey, relationshipMeta);
@@ -10611,8 +10626,9 @@
     var ember$data$lib$system$model$internal$model$$Promise = Ember.RSVP.Promise;
     var ember$data$lib$system$model$internal$model$$get = Ember.get;
     var ember$data$lib$system$model$internal$model$$set = Ember.set;
-    var ember$data$lib$system$model$internal$model$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$system$model$internal$model$$map = Ember.ArrayPolyfills.map;
+
+    var ember$data$lib$system$model$internal$model$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+    var ember$data$lib$system$model$internal$model$$map = ember$data$lib$ext$ember$array$$default.map;
 
     var ember$data$lib$system$model$internal$model$$_extractPivotNameCache = ember$data$lib$system$object$polyfills$$create(null);
     var ember$data$lib$system$model$internal$model$$_splitOnDotCache = ember$data$lib$system$object$polyfills$$create(null);
@@ -11415,9 +11431,10 @@
     var ember$data$lib$system$store$$set = Ember.set;
     var ember$data$lib$system$store$$once = Ember.run.once;
     var ember$data$lib$system$store$$isNone = Ember.isNone;
-    var ember$data$lib$system$store$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$system$store$$indexOf = Ember.ArrayPolyfills.indexOf;
-    var ember$data$lib$system$store$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$system$store$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
+    var ember$data$lib$system$store$$indexOf = ember$data$lib$ext$ember$array$$default.indexOf;
+    var ember$data$lib$system$store$$map = ember$data$lib$ext$ember$array$$default.map;
+    var ember$data$lib$system$store$$filter = ember$data$lib$ext$ember$array$$default.filter;
     var ember$data$lib$system$store$$Promise = Ember.RSVP.Promise;
     var ember$data$lib$system$store$$copy = Ember.copy;
     var ember$data$lib$system$store$$Store;
@@ -12972,7 +12989,6 @@
         var modelName = data.type;
                         
         var type = this.modelFor(modelName);
-        var filter = Ember.ArrayPolyfills.filter;
 
         // If Ember.ENV.DS_WARN_ON_UNKNOWN_KEYS is set to true and the payload
         // contains unknown keys, log a warning.
@@ -13469,9 +13485,9 @@
 
     var ember$data$lib$system$store$$default = ember$data$lib$system$store$$Store;
 
-    var ember$data$lib$serializers$json$api$serializer$$dasherize = Ember.String.dasherize;
-    var ember$data$lib$serializers$json$api$serializer$$get = Ember.get;
-    var ember$data$lib$serializers$json$api$serializer$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$serializers$json$api$serializer$$map = ember$data$lib$ext$ember$array$$default.map;
+    var ember$data$lib$serializers$json$api$serializer$$dasherize = ember$lib$main$$default.String.dasherize;
+    var ember$data$lib$serializers$json$api$serializer$$get = ember$lib$main$$default.get;
 
     var ember$data$lib$serializers$json$api$serializer$$default = ember$data$lib$serializers$json$serializer$$default.extend({
 
@@ -13491,13 +13507,13 @@
       */
       _normalizeDocumentHelper: function (documentHash) {
 
-        if (Ember.typeOf(documentHash.data) === 'object') {
+        if (ember$lib$main$$default.typeOf(documentHash.data) === 'object') {
           documentHash.data = this._normalizeResourceHelper(documentHash.data);
-        } else if (Ember.typeOf(documentHash.data) === 'array') {
+        } else if (ember$lib$main$$default.typeOf(documentHash.data) === 'array') {
           documentHash.data = ember$data$lib$serializers$json$api$serializer$$map.call(documentHash.data, this._normalizeResourceHelper, this);
         }
 
-        if (Ember.typeOf(documentHash.included) === 'array') {
+        if (ember$lib$main$$default.typeOf(documentHash.included) === 'array') {
           documentHash.included = ember$data$lib$serializers$json$api$serializer$$map.call(documentHash.included, this._normalizeResourceHelper, this);
         }
 
@@ -13527,7 +13543,8 @@
         var modelClass = this.store.modelFor(modelName);
         var serializer = this.store.serializerFor(modelName);
 
-        
+        ember$lib$main$$default.assert(this.toString() + ' is using the ' + (ember$data$lib$serializers$json$api$serializer$$get(this, 'isNewSerializerAPI') ? 'new' : 'old') + ' serializer API and expects ' + serializer.toString() + ' it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.', ember$data$lib$serializers$json$api$serializer$$get(this, 'isNewSerializerAPI') === ember$data$lib$serializers$json$api$serializer$$get(serializer, 'isNewSerializerAPI'));
+
         var _serializer$normalize = serializer.normalize(modelClass, resourceHash);
 
         var data = _serializer$normalize.data;
@@ -13557,7 +13574,6 @@
         @private
       */
       _normalizeResponse: function (store, primaryModelClass, payload, id, requestType, isSingle) {
-
         var normalizedPayload = this._normalizeDocumentHelper(payload);
         return normalizedPayload;
       },
@@ -13592,11 +13608,11 @@
       */
       extractRelationship: function (relationshipHash) {
 
-        if (Ember.typeOf(relationshipHash.data) === 'object') {
+        if (ember$lib$main$$default.typeOf(relationshipHash.data) === 'object') {
           relationshipHash.data = this._normalizeRelationshipDataHelper(relationshipHash.data);
         }
 
-        if (Ember.typeOf(relationshipHash.data) === 'array') {
+        if (ember$lib$main$$default.typeOf(relationshipHash.data) === 'array') {
           relationshipHash.data = ember$data$lib$serializers$json$api$serializer$$map.call(relationshipHash.data, this._normalizeRelationshipDataHelper, this);
         }
 
@@ -14738,9 +14754,10 @@
 
     var ember$data$lib$system$debug$debug$info$$default = ember$data$lib$system$model$$default;
     var ember$data$lib$system$debug$$default = ember$data$lib$system$debug$debug$adapter$$default;
+
     var ember$data$lib$serializers$embedded$records$mixin$$get = Ember.get;
     var ember$data$lib$serializers$embedded$records$mixin$$set = Ember.set;
-    var ember$data$lib$serializers$embedded$records$mixin$$forEach = Ember.ArrayPolyfills.forEach;
+    var ember$data$lib$serializers$embedded$records$mixin$$forEach = ember$data$lib$ext$ember$array$$default.forEach;
     var ember$data$lib$serializers$embedded$records$mixin$$camelize = Ember.String.camelize;
 
     /**
@@ -15683,7 +15700,7 @@
     }
 
     var ember$data$lib$system$relationships$ext$$get = Ember.get;
-    var ember$data$lib$system$relationships$ext$$filter = Ember.ArrayPolyfills.filter;
+    var ember$data$lib$system$relationships$ext$$filter = ember$data$lib$ext$ember$array$$default.filter;
 
     var ember$data$lib$system$relationships$ext$$relationshipsDescriptor = Ember.computed(function () {
       if (Ember.testing === true && ember$data$lib$system$relationships$ext$$relationshipsDescriptor._cacheable === true) {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data",
-  "version": "1.13.9",
+  "version": "1.13.10",
   "namespace": "DS",
   "repository": "git://github.com/emberjs/data.git",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "broccoli-yuidoc": "^1.3.0",
     "defeatureify": "~0.1.4",
     "ejs": "^1.0.0",
-    "ember-cli": "^0.1.15",
+    "ember-cli": "^0.2.2",
     "ember-new-computed": "1.0.2",
     "ember-inflector": "^1.9.0",
     "ember-publisher": "0.0.7",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-source
 version: !ruby/object:Gem::Version
-  version: 1.13.9
+  version: 1.13.10
 platform: ruby
 authors:
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-source