Fixes #223.

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 1.1.1 - xx October 2014
+
+###### Backwards compatible bug fixes
+- #223 - need to update lastModified when an item is re-injected
+
 ##### 1.1.0 - 30 October 2014
 
 ###### Backwards compatible API changes

dist/angular-data.js

@@ -6445,6 +6445,7 @@ function _inject(definition, resource, attrs, options) {
         definition.beforeInject(definition.name, attrs);
         var id = attrs[idA];
         var item = DS.get(definition.name, id);
+        var initialLastModified = item ? resource.modified[id] : 0;
 
         if (!item) {
           if (options.useClass) {
@@ -6493,6 +6494,7 @@ function _inject(definition, resource, attrs, options) {
           resource.observers[id].deliver();
         }
         resource.saved[id] = DS.utils.updateTimestamp(resource.saved[id]);
+        resource.modified[id] = initialLastModified && resource.modified[id] === initialLastModified ? DS.utils.updateTimestamp(resource.modified[id]) : resource.modified[id];
         definition.afterInject(definition.name, item);
         injected = item;
       } catch (err) {
@@ -6598,9 +6600,11 @@ function inject(resourceName, attrs, options) {
   if (!DS.$rootScope.$$phase) {
     DS.$rootScope.$apply(function () {
       injected = _inject.call(DS, definition, resource, attrs, options);
+      resource.collectionModified = DS.utils.updateTimestamp(resource.collectionModified);
     });
   } else {
     injected = _inject.call(DS, definition, resource, attrs, options);
+    resource.collectionModified = DS.utils.updateTimestamp(resource.collectionModified);
   }
 
   if (options.linkInverse) {

dist/angular-data.min.js

@@ -116,6 +116,7 @@ function _inject(definition, resource, attrs, options) {
         definition.beforeInject(definition.name, attrs);
         var id = attrs[idA];
         var item = DS.get(definition.name, id);
+        var initialLastModified = item ? resource.modified[id] : 0;
 
         if (!item) {
           if (options.useClass) {
@@ -164,6 +165,7 @@ function _inject(definition, resource, attrs, options) {
           resource.observers[id].deliver();
         }
         resource.saved[id] = DS.utils.updateTimestamp(resource.saved[id]);
+        resource.modified[id] = initialLastModified && resource.modified[id] === initialLastModified ? DS.utils.updateTimestamp(resource.modified[id]) : resource.modified[id];
         definition.afterInject(definition.name, item);
         injected = item;
       } catch (err) {
@@ -269,9 +271,11 @@ function inject(resourceName, attrs, options) {
   if (!DS.$rootScope.$$phase) {
     DS.$rootScope.$apply(function () {
       injected = _inject.call(DS, definition, resource, attrs, options);
+      resource.collectionModified = DS.utils.updateTimestamp(resource.collectionModified);
     });
   } else {
     injected = _inject.call(DS, definition, resource, attrs, options);
+    resource.collectionModified = DS.utils.updateTimestamp(resource.collectionModified);
   }
 
   if (options.linkInverse) {

src/datastore/sync_methods/inject.js

@@ -22,11 +22,11 @@ describe('DS.changeHistory(resourceName, id)', function () {
     assert.isUndefined(DS.changeHistory('post', 5));
   });
   it('should return the changeHistory in an object', function (done) {
-    DS.inject('post', p1);
+    Post.inject(p1);
 
-    var initialModified = DS.store['post'].modified[5];
+    var initialModified = Post.lastModified(5);
     assert.deepEqual(DS.changeHistory('post', 5), [
-      {resourceName: 'post', added: {}, changed: {}, removed: {}, timestamp: initialModified, target: DS.get('post', 5)}
+      {resourceName: 'post', added: {}, changed: {}, removed: {}, timestamp: Post.lastModified(5), target: DS.get('post', 5)}
     ]);
 
     var post = DS.get('post', 5);
@@ -42,11 +42,11 @@ describe('DS.changeHistory(resourceName, id)', function () {
           {resourceName: 'post', added: {}, changed: { author: 'Jake' }, removed: {}, timestamp: DS.store['post'].modified[5], target: DS.get('post', 5)}
         ]);
 
-        DS.inject('post', p1);
 
-        initialModified = DS.store['post'].modified[5];
+        DS.inject('post', p1);
+        initialModified = Post.lastModified(5);
         assert.deepEqual(DS.changeHistory('post', 5), [
-          {resourceName: 'post', added: {}, changed: { author: 'John' }, removed: {}, timestamp: initialModified, target: DS.get('post', 5)}
+          {resourceName: 'post', added: {}, changed: { author: 'John' }, removed: {}, timestamp: Post.lastModified(5), target: DS.get('post', 5)}
         ]);
         var post = DS.get('post', 5);
         post.author = 'Johnny';
@@ -58,7 +58,7 @@ describe('DS.changeHistory(resourceName, id)', function () {
             DS.digest();
             assert.deepEqual(DS.changeHistory('post', 5), [
               {resourceName: 'post', added: {}, changed: { author: 'John' }, removed: {}, timestamp: initialModified, target: DS.get('post', 5)},
-              {resourceName: 'post', added: {}, changed: { author: 'Johnny' }, removed: {}, timestamp: DS.store['post'].modified[5], target: DS.get('post', 5)}
+              {resourceName: 'post', added: {}, changed: { author: 'Johnny' }, removed: {}, timestamp: Post.lastModified(5), target: DS.get('post', 5)}
             ]);
             done();
           } catch (err) {

test/integration/datastore/sync_methods/changeHistory.test.js

@@ -87,6 +87,27 @@ describe('DS.lastModified(resourceName[, id])', function () {
       }
     }, 100);
   });
+  it('should update the lastModified timestamp of an item when the item is re-injected', function (done) {
+
+    var Thing = DS.defineResource('thing');
+
+    var thing = Thing.inject({ id: 1, foo: 'bar', bing: { boom: 'bam' } });
+    var time = Thing.lastModified(1);
+
+    Thing.inject(thing);
+    if (typeof Object.observe !== 'function') {
+      Thing.digest();
+    }
+    setTimeout(function () {
+      try {
+        assert.notEqual(time, Thing.lastModified(1));
+        done();
+      } catch (e) {
+        console.log(e.stack);
+        done(e);
+      }
+    }, 100);
+  });
 //	it('should lastModified an item into the store', function (done) {
 //
 //		assert.equal(DS.lastModified('post', 5), 0);