Closes #120.

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 0.10.6 - xx August 2014
+
+###### Backwards compatible API changes
+- #120 - When using DSCacheFactory, allow onExpire to be specified
+
 ##### 0.10.5 - 14 August 2014
 
 ###### Backwards compatible API changes

Gruntfile.js

@@ -117,6 +117,19 @@ module.exports = function (grunt) {
           ]
         }
       },
+      DSCacheFactory: {
+        browsers: ['Firefox', 'PhantomJS'],
+        options: {
+          files: [
+            'bower_components/angular/angular.js',
+            'bower_components/angular-mocks/angular-mocks.js',
+            'bower_components/angular-cache/dist/angular-cache.js',
+            'dist/angular-data.js',
+            'karma.start.js',
+            'test/integration/datastore/DSCacheFactory.test.js'
+          ]
+        }
+      },
       ci: {
         browsers: ['Firefox', 'PhantomJS'],
         exclude: [
@@ -356,7 +369,7 @@ module.exports = function (grunt) {
     grunt.file.write('dist/angular-data.js', file);
   });
 
-  grunt.registerTask('test', ['build', 'karma:ci', 'karma:cacheFactory', 'karma:min']);
+  grunt.registerTask('test', ['build', 'karma:ci', 'karma:cacheFactory', 'karma:DSCacheFactory', 'karma:min']);
   grunt.registerTask('doc', ['clean:doc', 'docular', 'concat', 'copy', 'clean:afterDoc', 'uglify:scripts']);
   grunt.registerTask('build', [
     'clean',

README.md

@@ -2,8 +2,8 @@
 
 __Data store for Angular.js.__
 
-__Latest Release:__ [0.10.5](http://angular-data.pseudobry.com/)
-__master:__ [0.10.5](http://angular-data-next.pseudobry.com/)
+__Latest Release:__ [0.10.6](http://angular-data.pseudobry.com/)
+__master:__ [0.10.6](http://angular-data-next.pseudobry.com/)
 
 Angular-data is approaching 1.0.0 Beta. The API is stabilizing 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": "0.10.5",
+  "version": "0.10.6",
   "homepage": "http://angular-data.pseudobry.com/",
   "repository": {
     "type": "git",

dist/angular-data.js

@@ -1,7 +1,7 @@
 /**
 * @author Jason Dobry <[email protected]>
 * @file angular-data.js
-* @version 0.10.5 - Homepage <http://angular-data.pseudobry.com/>
+* @version 0.10.6 - Homepage <http://angular-data.pseudobry.com/>
 * @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>
 * @license MIT <https://github.com/jmdobry/angular-data/blob/master/LICENSE>
 *
@@ -4542,7 +4542,10 @@ function defineResource(definition) {
       cacheFlushInterval: def.cacheFlushInterval || null,
       deleteOnExpire: def.deleteOnExpire || 'none',
       onExpire: function (id) {
-        DS.eject(def.name, id);
+        var item = DS.eject(def.name, id);
+        if (DS.utils.isFunction(def.onExpire)) {
+          def.onExpire(id, item);
+        }
       },
       capacity: Number.MAX_VALUE,
       storageMode: 'memory',

dist/angular-data.min.js

@@ -72,7 +72,7 @@
                         <i class="icon-wrench icon-white"></i> API <b class="caret"></b>
                     </a>
                     <ul class="dropdown-menu">
-                        <li class="nav-header">Angular-data - 0.10.5</li>
+                        <li class="nav-header">Angular-data - 0.10.6</li>
                         <li>
                             <a href="/documentation/api/angular-data/angular-data">Overview</a>
                         </li>

guide/nav.html

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

package.json

@@ -142,7 +142,10 @@ function defineResource(definition) {
       cacheFlushInterval: def.cacheFlushInterval || null,
       deleteOnExpire: def.deleteOnExpire || 'none',
       onExpire: function (id) {
-        DS.eject(def.name, id);
+        var item = DS.eject(def.name, id);
+        if (DS.utils.isFunction(def.onExpire)) {
+          def.onExpire(id, item);
+        }
       },
       capacity: Number.MAX_VALUE,
       storageMode: 'memory',

src/datastore/sync_methods/defineResource.js

@@ -55,7 +55,8 @@ describe('DSCacheFactory integration', function () {
       endpoint: '/comments',
       deleteOnExpire: 'aggressive',
       recycleFreq: 10,
-      maxAge: 20
+      maxAge: 20,
+      onExpire: sinon.spy()
     });
 
     $httpBackend.expectGET('http://test.angular-cache.com/comments/5').respond(200, {
@@ -85,11 +86,33 @@ describe('DSCacheFactory integration', function () {
     setTimeout(function () {
       assert.isUndefined(DS.get('Comment', 5));
 
+      assert.equal(DS.definitions.Comment.onExpire.callCount, 1, 'onExpire should have been called once');
+      assert.isTrue(DS.definitions.Comment.onExpire.calledWithExactly('5', {
+        id: 5,
+        text: 'test'
+      }), 'onExpire should have been called with the right arguments');
       assert.equal(lifecycle.beforeInject.callCount, 1, 'beforeInject should have been called');
       assert.equal(lifecycle.afterInject.callCount, 1, 'afterInject should have been called');
       assert.equal(lifecycle.serialize.callCount, 0, 'serialize should have been called');
       assert.equal(lifecycle.deserialize.callCount, 1, 'deserialize should have been called');
 
+      $httpBackend.expectGET('http://test.angular-cache.com/comments/5').respond(200, {
+        id: 5,
+        text: 'test'
+      });
+
+      DS.find('Comment', 5).then(function (comment) {
+        assert.deepEqual(comment, {
+          id: 5,
+          text: 'test'
+        });
+      }, function (err) {
+        console.error(err.stack);
+        fail('Should not have rejected!');
+      });
+
+      $httpBackend.flush();
+
       done();
     }, 100);
   });