Update to latest ember(-data) and fix deprecations

streamlink · Mar 30, 2015 · 5605723 · 5605723
1 parent 5675664
commit 5605723
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/bower.json b/bower.json
@@ -3,9 +3,9 @@
 	"dependencies": {
 		"requirejs": "2.1.16",
 		"requirejs-text": "2.0.14",
-		"ember": "1.11.0-beta.5",
-		"ember-data": "1.0.0-beta.15",
-		"ember-localstorage-adapter": "0.5.0",
+		"ember": "1.11.0",
+		"ember-data": "1.0.0-beta.16.1",
+		"ember-localstorage-adapter": "git@github.com:kurko/ember-localstorage-adapter#83bc2f18dd",
 		"jquery": "2.1.3",
 		"bootstrap": "3.3.1",
 		"font-awesome": "4.3.0",

diff --git a/src/app/controllers/NotificationController.js b/src/app/controllers/NotificationController.js
@@ -71,11 +71,11 @@ define([
 			var follows = self.store.modelFor( "twitchUserFollowsChannel" );
 			var adapter = self.store.adapterFor( "twitchUserFollowsChannel" );
 
-			adapter.on( "createRecord", function( store, type, record ) {
+			adapter.on( "createRecord", function( store, type, snapshot ) {
 				if ( !get( self, "enabled" ) ) { return; }
 				if ( type !== follows ) { return; }
 
-				var name = get( record, "id" );
+				var name = snapshot.id;
 				// is the followed channel online?
 				store.fetchById( "twitchStream", name )
 					.then(function() {

diff --git a/src/app/store/AdapterMixin.js b/src/app/store/AdapterMixin.js
@@ -10,8 +10,8 @@ define( [ "ember" ], function( Ember ) {
 	 * instead of using type.typeKey as name
 	 */
 	return Ember.Mixin.create( Ember.Evented, {
-		find: function( store, type, id ) {
-			return this.ajax( this.buildURL( type, id ), "GET" );
+		find: function( store, type, id, snapshot ) {
+			return this.ajax( this.buildURL( type, id, snapshot ), "GET" );
 		},
 
 		findAll: function( store, type, sinceToken ) {
@@ -24,55 +24,50 @@ define( [ "ember" ], function( Ember ) {
 		},
 
 		createRecordMethod: "POST",
-		createRecord: function( store, type, record ) {
-			var id = get( record, "id" );
+		createRecord: function( store, type, snapshot ) {
 			return this.ajax(
-				this.buildURL( type, id ),
+				this.buildURL( type, snapshot.id, snapshot ),
 				get( this, "createRecordMethod" ),
-				this.createRecordData( store, type, record )
+				this.createRecordData( store, type, snapshot )
 			)
 				.then(function( data ) {
-					this.trigger( "createRecord", store, type, record );
+					this.trigger( "createRecord", store, type, snapshot );
 					return data;
 				}.bind( this ) );
 		},
-		createRecordData: function( store, type, record ) {
+		createRecordData: function( store, type, snapshot ) {
 			var data = {},
-			    serializer = store.serializerFor( type.typeKey ),
-			    snapshot = record._createSnapshot();
+			    serializer = store.serializerFor( type.typeKey );
 			serializer.serializeIntoHash( data, type, snapshot, { includeId: true } );
 			return { data: data };
 		},
 
 		updateRecordMethod: "PUT",
-		updateRecord: function( store, type, record ) {
-			var id = get( record, "id" );
+		updateRecord: function( store, type, snapshot ) {
 			return this.ajax(
-				this.buildURL( type, id ),
+				this.buildURL( type, snapshot.id, snapshot ),
 				get( this, "updateRecordMethod" ),
-				this.updateRecordData( store, type, record )
+				this.updateRecordData( store, type, snapshot )
 			)
 				.then(function( data ) {
-					this.trigger( "updateRecord", store, type, record );
+					this.trigger( "updateRecord", store, type, snapshot );
 					return data;
 				}.bind( this ) );
 		},
-		updateRecordData: function( store, type, record ) {
+		updateRecordData: function( store, type, snapshot ) {
 			var data = {},
-			    serializer = store.serializerFor( type.typeKey ),
-			    snapshot = record._createSnapshot();
+			    serializer = store.serializerFor( type.typeKey );
 			serializer.serializeIntoHash( data, type, snapshot );
 			return { data: data };
 		},
 
-		deleteRecord: function( store, type, record ) {
-			var id = get( record, "id" );
+		deleteRecord: function( store, type, snapshot ) {
 			return this.ajax(
-				this.buildURL( type, id ),
+				this.buildURL( type, snapshot.id, snapshot ),
 				"DELETE"
 			)
 				.then(function( data ) {
-					this.trigger( "deleteRecord", store, type, record );
+					this.trigger( "deleteRecord", store, type, snapshot );
 					return data;
 				}.bind( this ) );
 		},