Closes #170.

Author: jmdobry

CHANGELOG.md

@@ -7,6 +7,7 @@
 - #161 - Allow the http method of DSHttpAdapter methods to be configured
 - #166 - Add ID Resolver
 - #167 - Default params argument of bindAll to empty object
+- #170 - Global callbacks
 - #171 - "not in" query
 
 ###### Backwards compatible bug fixes

README.md

@@ -9,7 +9,7 @@ Unlike Backbone and Ember Models, angular-data does not require the use of gette
 Supporting relations, computed properties, model lifecycle control and a slew of other features, angular-data is the tool for giving your data the respect it deserves.
 
 __Latest Release:__ [1.0.0-rc.1](http://angular-data.pseudobry.com/)
-__master:__ [1.0.0-rc.1](http://angular-data-next.pseudobry.com/)
+__master:__ [1.0.0-rc.2](http://angular-data-next.pseudobry.com/)
 
 Angular-data is in a 1.0.0 Beta. The API is rather stable and angular-data is well tested.
 

bower.json

@@ -2,7 +2,7 @@
   "author": "Jason Dobry",
   "name": "angular-data",
   "description": "Data store for Angular.js.",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "homepage": "http://angular-data.pseudobry.com/",
   "repository": {
     "type": "git",

karma.start.js

@@ -1,6 +1,7 @@
 // Setup global test variables
 var $rootScope, $q, $log, $timeout, DSHttpAdapterProvider, DSProvider, DSLocalStorageAdapter, DS, DSUtils, DSHttpAdapter, app, $httpBackend, p1, p2, p3, p4, p5;
 
+var Post, User, Organization, Comment, Profile;
 var user1, organization2, comment3, profile4;
 var comment11, comment12, comment13, organization14, profile15, user10, user16, user17, user18, organization15, user19, user20, comment19, user22, profile21;
 
@@ -128,12 +129,12 @@ function startInjector() {
     DSHttpAdapter = _DSHttpAdapter_;
     DSLocalStorageAdapter = _DSLocalStorageAdapter_;
     $httpBackend = _$httpBackend_;
-    DS.defineResource({
+    Post = DS.defineResource({
       name: 'post',
       keepChangeHistory: true,
       endpoint: '/posts'
     });
-    DS.defineResource({
+    User = DS.defineResource({
       name: 'user',
       relations: {
         hasMany: {
@@ -158,7 +159,7 @@ function startInjector() {
       }
     });
 
-    DS.defineResource({
+    Organization = DS.defineResource({
       name: 'organization',
       relations: {
         hasMany: {
@@ -170,7 +171,7 @@ function startInjector() {
       }
     });
 
-    DS.defineResource({
+    Profile = DS.defineResource({
       name: 'profile',
       relations: {
         belongsTo: {
@@ -182,7 +183,7 @@ function startInjector() {
       }
     });
 
-    DS.defineResource({
+    Comment = DS.defineResource({
       name: 'comment',
       relations: {
         belongsTo: {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-data",
   "description": "Data store for Angular.js.",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "homepage": "http://angular-data.pseudobry.com",
   "repository": {
     "type": "git",

test/integration/datastore/async_methods/update.test.js

@@ -115,11 +115,26 @@ describe('DS.update(resourceName, id, attrs[, options])', function () {
 
     $httpBackend.flush();
 
-    $httpBackend.expectPUT('http://test.angular-cache.com/user/4/comment/6').respond(200, testComment2);
+    $httpBackend.expectPUT('http://test.angular-cache.com/user/4/comment/6', { content: 'stuff' }).respond(200, testComment2);
 
-    DS.inject('comment', testComment2);
+    var comment = DS.inject('comment', testComment2);
 
-    DS.update('comment', 6, {
+    function onBeforeUpdate (resourceName, attrs) {
+      attrs.other = 'stuff';
+      assert.equal(resourceName, 'comment');
+      assert.deepEqual(attrs, { content: 'stuff', other: 'stuff' });
+    }
+
+    function onAfterUpdate(resourceName, attrs) {
+      assert.equal(resourceName, 'comment');
+      assert.deepEqual(attrs, testComment2);
+      assert.isFalse(testComment2 === attrs);
+    }
+
+    Comment.on('DS.beforeUpdate', onBeforeUpdate);
+    Comment.on('DS.afterUpdate', onAfterUpdate);
+
+    Comment.update(comment, {
       content: 'stuff'
     }, {
       params: {