Updated CHANGELOG.md.

Author: jmdobry

CHANGELOG.md

@@ -9,6 +9,7 @@
 - #167 - Default params argument of bindAll to empty object
 - #170 - Global callbacks
 - #171 - "not in" query
+- #177 - Allow promises to be returned in lifecycle hooks
 
 ###### Backwards compatible bug fixes
 - #156 - cached findAll pending query doesn't get removed sometimes

dist/angular-data.js

@@ -7102,7 +7102,7 @@ module.exports = [function () {
 
             try {
               var promise = fn.apply(target || this, args);
-              if(promise && promise.then){
+              if (promise && promise.then) {
                 promise.then(deferred.resolve, deferred.reject);
               }
             } catch (err) {

src/index.js

@@ -72,7 +72,7 @@
 
             try {
               var promise = fn.apply(target || this, args);
-              if(promise && promise.then){
+              if (promise && promise.then) {
                 promise.then(deferred.resolve, deferred.reject);
               }
             } catch (err) {

test/integration/index.js renamed to test/integration/index.test.js

@@ -1,13 +1,13 @@
-describe('$q decorator', function(){
+describe('$q decorator', function () {
   beforeEach(module('angular-data.DS'));
 
-  it('should decorate $q', inject(function($q){
+  it('should decorate $q', inject(function ($q) {
     assert.isFunction($q.promisify);
   }));
 
-  it('should resolve with a cb', inject(function($q, $rootScope){
+  it('should resolve with a cb', inject(function ($q, $rootScope) {
     var resolveValue = {};
-    var resolveCb = function(cb){
+    var resolveCb = function (cb) {
       cb(null, resolveValue);
     };
     var resolveSpy = sinon.spy();
@@ -18,9 +18,9 @@ describe('$q decorator', function(){
     assert(resolveSpy.calledWith(resolveValue));
   }));
 
-  it('should reject with a cb', inject(function($q, $rootScope){
+  it('should reject with a cb', inject(function ($q, $rootScope) {
     var rejectValue = {};
-    var rejectCb = function(cb){
+    var rejectCb = function (cb) {
       cb(rejectValue);
     };
     var rejectSpy = sinon.spy();
@@ -31,9 +31,9 @@ describe('$q decorator', function(){
     assert(rejectSpy.calledWith(rejectValue));
   }));
 
-  it('should resolve with a promise', inject(function($q, $rootScope){
+  it('should resolve with a promise', inject(function ($q, $rootScope) {
     var resolveValue = {};
-    var resolveCb = function(cb){
+    var resolveCb = function () {
       return $q.when(resolveValue);
     };
     var resolveSpy = sinon.spy();
@@ -44,9 +44,9 @@ describe('$q decorator', function(){
     assert(resolveSpy.calledWith(resolveValue));
   }));
 
-  it('should reject with a promise', inject(function($q, $rootScope){
+  it('should reject with a promise', inject(function ($q, $rootScope) {
     var rejectValue = {};
-    var rejectCb = function(cb){
+    var rejectCb = function () {
       return $q.reject(rejectValue);
     };
     var rejectSpy = sinon.spy();
@@ -60,12 +60,12 @@ describe('$q decorator', function(){
   //Typically, functions that return a promise will be wrapped with a $q.when, meaning if you were to return nothing, it would execute straight away
   //This would mean the cb style would not work at all, as any developer that uses cb would have the function immediately resolve
   //This just ensures that doesn't ever happen
-  it('should not resolve or reject if return value is not a promise', inject(function($q, $rootScope){
+  it('should not resolve or reject if return value is not a promise', inject(function ($q, $rootScope) {
     var resolve;
-    var cb = function(next){
+    var cb = function (next) {
       resolve = next;
       return true;
-    }
+    };
     var spy = sinon.spy();
 
     $q.promisify(cb)().finally(spy);
@@ -78,4 +78,4 @@ describe('$q decorator', function(){
 
     assert(spy.called);
   }));
-})
+});