Merge pull request #26 from richmolj/master

Move to predictive temp IDs

Author: wadetandy

src/util/temp-id.ts

@@ -0,0 +1,7 @@
+let memo = 0
+const generate = function() : string {
+  memo++
+  return `temp-id-${memo}`
+}
+
+export default { generate }

src/util/uuid.ts

@@ -1,7 +1,7 @@
 import Model from '../model';
 import IncludeDirective from './include-directive';
 import * as _snakeCase from './snakecase';
-import uuid from './uuid';
+import tempId from './temp-id';
 let snakeCase: any = (<any>_snakeCase).default || _snakeCase;
 snakeCase = snakeCase['default'] || snakeCase;
 
@@ -134,7 +134,7 @@ export default class WritePayload {
     model.clearErrors();
 
     if (!model.isPersisted()) {
-      model.temp_id = uuid.generate();
+      model.temp_id = tempId.generate()
     }
 
     let wp            = new WritePayload(model, nested);

src/util/write-payload.ts

@@ -1,6 +1,6 @@
 import { sinon, expect, fetchMock } from '../test-helper';
 import { Author, Book, Genre } from '../fixtures';
-import uuid from '../../src/util/uuid';
+import tempId from '../../src/util/temp-id';
 
 let fetchMock = require('fetch-mock');
 
@@ -184,15 +184,15 @@ describe('nested persistence', function() {
 
   let tempIdIndex = 0;
   beforeEach(function() {
-    sinon.stub(uuid, 'generate').callsFake(function() {
+    sinon.stub(tempId, 'generate').callsFake(function() {
       tempIdIndex++
       return `abc${tempIdIndex}`;
     });
   });
 
   afterEach(function() {
     tempIdIndex = 0;
-    uuid.generate['restore']();
+    tempId.generate['restore']();
   });
 
   describe('basic nested create', function() {

test/integration/nested-persistence-test.ts

@@ -1,6 +1,6 @@
 import { expect, sinon, fetchMock } from '../test-helper';
 import { Author, Book, Genre } from '../fixtures';
-import uuid from '../../src/util/uuid';
+import tempId from '../../src/util/temp-id';
 
 const resetMocks = function() {
   fetchMock.restore();
@@ -94,7 +94,7 @@ describe('validations', function() {
   });
 
   beforeEach(function() {
-    sinon.stub(uuid, 'generate').callsFake(function() {
+    sinon.stub(tempId, 'generate').callsFake(function() {
       tempIdIndex++
       return `abc${tempIdIndex}`;
     });
@@ -108,7 +108,7 @@ describe('validations', function() {
 
   afterEach(function() {
     tempIdIndex = 0;
-    uuid.generate['restore']();
+    tempId.generate['restore']();
   });
 
   it('applies errors to the instance', function(done) {