Support for pagination, and selective rollback for single attribute (#95

) * Support added for metadata. Allows pagination in ember * Support added for metadata. Allows pagination in ember * Support added for metadata. Allows pagination in ember * added rollbackSingleAttribute method * updated rollbackSingleAttribute method * updated rollbackSingleAttribute method * Improve EG to support client notification that a model was deleted on the backend. Also improved logging of model errors. * Update compiled files * Bumps eg versions in bower and package.json
stingerlabs · Jan 19, 2017 · 7df3a56 · 7df3a56
1 parent 374ddea
commit 7df3a56
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 41 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,7 @@
 {
 	"name": "ember-graph",
 	"description": "Ember persistence library for complex object graphs",
+    "version": "1.1.0",
     "main": "dist/ember-graph.js",
     "homepage": "https://github.com/stingerlabs/ember-graph",
     "repository": {
@@ -41,4 +42,4 @@
         ".travis.yml",
         "Gruntfile.js"
     ]
-}
+}
diff --git a/dist/ember-graph.js b/dist/ember-graph.js
@@ -2633,6 +2633,16 @@ define('ember-graph/model/core', ['exports', 'ember', 'ember-graph/util/set', 'e
 			this.set('clientAttributes', _ember.default.Object.create());
 		},
 
+		/**
+   * Resets a single attribute to last known server attribute
+   *
+   * @method rollbackSingleAttribute
+   * @param {String} attr
+   */
+		rollbackSingleAttribute: function (attr) {
+			this.clientAttributes.set(attr, this.serverAttributes.get(attr));
+		},
+
 		/**
    * Loads attributes from the server.
    */
@@ -3331,7 +3341,7 @@ define('ember-graph/model/relationship', ['exports', 'ember', 'ember-graph/relat
 						return;
 					}
 
-					if (!oldVal && newVal || oldVal && !newVal || (oldVal.typeKey !== newVal.typeKey || oldVal.id !== newVal.id)) {
+					if (!oldVal && newVal || oldVal && !newVal || oldVal.typeKey !== newVal.typeKey || oldVal.id !== newVal.id) {
 						changes[name] = [oldVal, newVal];
 					}
 				}
@@ -6496,7 +6506,7 @@ define('ember-graph/store/relationship', ['exports', 'ember', 'ember-graph/relat
 				/* eslint-enable */
 
 				// Everything else is invalid
-				_ember.default.assert('Invalid hasOne relationship values.');
+				_ember.default.assert('Invalid hasOne relationship values for: ' + type + '.' + name);
 			});
 
 			return values;
@@ -6874,15 +6884,20 @@ define('ember-graph/store/store', ['exports', 'ember', 'ember-graph/store/record
 				recordRequestCache.savePendingRequest(typeKey, query, promise);
 			}
 
-			return _emberGraphDataPromise_object.PromiseArray.create({
-				promise: promise.then(function (payload) {
-					var records = payload.meta.matchedRecords;
-					_this4.pushPayload(payload);
+			return promise.then(function (payload) {
+				return {
+					records: _emberGraphDataPromise_object.PromiseArray.create({
+						promise: promise.then(function (payload) {
+							var records = payload.meta.matchedRecords;
+							_this4.pushPayload(payload);
 
-					return records.map(function (record) {
-						return _this4.getRecord(record.type, record.id);
-					});
-				})
+							return records.map(function (record) {
+								return _this4.getRecord(record.type, record.id);
+							});
+						})
+					}),
+					meta: payload.meta.serverMeta
+				};
 			});
 		},
 
@@ -7108,7 +7123,7 @@ define('ember-graph/store/store', ['exports', 'ember', 'ember-graph/store/record
 			_ember.default.changeProperties(function () {
 				var reloadDirty = _this9.get('reloadDirty');
 
-				(_ember.default.get(payload, 'meta.deletedRecords') || []).forEach(function (record) {
+				(_ember.default.get(payload, 'meta.serverMeta.deletedRecords') || []).forEach(function (record) {
 					_this9.deleteRecordFromStore(record.type, record.id);
 				});
 

diff --git a/dist/ember-graph.min.js b/dist/ember-graph.min.js
diff --git a/dist/ember-graph.prod.js b/dist/ember-graph.prod.js
@@ -2633,6 +2633,16 @@ define('ember-graph/model/core', ['exports', 'ember', 'ember-graph/util/set', 'e
 			this.set('clientAttributes', _ember.default.Object.create());
 		},
 
+		/**
+   * Resets a single attribute to last known server attribute
+   *
+   * @method rollbackSingleAttribute
+   * @param {String} attr
+   */
+		rollbackSingleAttribute: function (attr) {
+			this.clientAttributes.set(attr, this.serverAttributes.get(attr));
+		},
+
 		/**
    * Loads attributes from the server.
    */
@@ -3313,7 +3323,7 @@ define('ember-graph/model/relationship', ['exports', 'ember', 'ember-graph/relat
 						return;
 					}
 
-					if (!oldVal && newVal || oldVal && !newVal || (oldVal.typeKey !== newVal.typeKey || oldVal.id !== newVal.id)) {
+					if (!oldVal && newVal || oldVal && !newVal || oldVal.typeKey !== newVal.typeKey || oldVal.id !== newVal.id) {
 						changes[name] = [oldVal, newVal];
 					}
 				}
@@ -6840,15 +6850,20 @@ define('ember-graph/store/store', ['exports', 'ember', 'ember-graph/store/record
 				recordRequestCache.savePendingRequest(typeKey, query, promise);
 			}
 
-			return _emberGraphDataPromise_object.PromiseArray.create({
-				promise: promise.then(function (payload) {
-					var records = payload.meta.matchedRecords;
-					_this4.pushPayload(payload);
+			return promise.then(function (payload) {
+				return {
+					records: _emberGraphDataPromise_object.PromiseArray.create({
+						promise: promise.then(function (payload) {
+							var records = payload.meta.matchedRecords;
+							_this4.pushPayload(payload);
 
-					return records.map(function (record) {
-						return _this4.getRecord(record.type, record.id);
-					});
-				})
+							return records.map(function (record) {
+								return _this4.getRecord(record.type, record.id);
+							});
+						})
+					}),
+					meta: payload.meta.serverMeta
+				};
 			});
 		},
 
@@ -7074,7 +7089,7 @@ define('ember-graph/store/store', ['exports', 'ember', 'ember-graph/store/record
 			_ember.default.changeProperties(function () {
 				var reloadDirty = _this9.get('reloadDirty');
 
-				(_ember.default.get(payload, 'meta.deletedRecords') || []).forEach(function (record) {
+				(_ember.default.get(payload, 'meta.serverMeta.deletedRecords') || []).forEach(function (record) {
 					_this9.deleteRecordFromStore(record.type, record.id);
 				});
 

diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "Ember-Graph",
 	"license": "MIT",
+	"version": "1.1.0",
     "repository": {
       "type": "git",
       "url": "https://github.com/stingerlabs/ember-graph"

diff --git a/src/model/core.js b/src/model/core.js
@@ -151,6 +151,16 @@ var CoreModel = Ember.Object.extend({
 		this.set('clientAttributes', Ember.Object.create());
 	},
 
+	/**
+	 * Resets a single attribute to last known server attribute
+	 *
+	 * @method rollbackSingleAttribute
+	 * @param {String} attr
+	 */
+	rollbackSingleAttribute: function(attr) {
+		this.clientAttributes.set(attr, this.serverAttributes.get(attr));
+	},
+
 	/**
 	 * Loads attributes from the server.
 	 */

diff --git a/src/store/relationship.js b/src/store/relationship.js
@@ -217,7 +217,7 @@ export default {
 			/* eslint-enable */
 
 			// Everything else is invalid
-			Ember.assert('Invalid hasOne relationship values.');
+			Ember.assert('Invalid hasOne relationship values for: ' + type + '.' + name);
 		});
 
 		return values;

diff --git a/src/store/store.js b/src/store/store.js
@@ -355,15 +355,20 @@ var Store = (Ember.Service || Ember.Object).extend({
 			recordRequestCache.savePendingRequest(typeKey, query, promise);
 		}
 
-		return PromiseArray.create({
-			promise: promise.then((payload) => {
-				var records = payload.meta.matchedRecords;
-				this.pushPayload(payload);
-
-				return records.map((record) => {
-					return this.getRecord(record.type, record.id);
-				});
-			})
+		return promise.then((payload) => {
+			return {
+				records: PromiseArray.create({
+					promise: promise.then((payload) => {
+						var records = payload.meta.matchedRecords;
+						this.pushPayload(payload);
+
+						return records.map((record) => {
+							return this.getRecord(record.type, record.id);
+						});
+					})
+				}),
+				meta: payload.meta.serverMeta
+			};
 		});
 	},
 
@@ -577,7 +582,7 @@ var Store = (Ember.Service || Ember.Object).extend({
 		Ember.changeProperties(() => {
 			const reloadDirty = this.get('reloadDirty');
 
-			(Ember.get(payload, 'meta.deletedRecords') || []).forEach((record) => {
+			(Ember.get(payload, 'meta.serverMeta.deletedRecords') || []).forEach((record) => {
 				this.deleteRecordFromStore(record.type, record.id);
 			});
 

diff --git a/test/store/delete.js b/test/store/delete.js
@@ -109,11 +109,13 @@
 
 		store.pushPayload({
 			meta: {
-				deletedRecords: [
-					{ type: 'post', id: '1' },
-					{ type: 'post', id: '2' },
-					{ type: 'post', id: '3' }
-				]
+				serverMeta: {
+					deletedRecords: [
+						{ type: 'post', id: '1' },
+						{ type: 'post', id: '2' },
+						{ type: 'post', id: '3' }
+					]
+				}
 			}
 		});