updated to allow custom url override

Author: nickforddev

src/demo/user.js

@@ -12,7 +12,7 @@ export default class User extends Model {
             const basePath = this.$options.basePath
             return basePath || this.role + 's'
           } else {
-            return ''
+            return 'users'
           }
         },
         full_name() {

src/model.js

@@ -52,7 +52,9 @@ class Model {
         },
         urlRoot() {
           const url = _options.url
-            ? _options.url
+            ? typeof _options.url === 'function'
+              ? _options.url()
+              : _options.url
             : `${this.basePath}/${this.id}`
           return url
         },
@@ -61,7 +63,9 @@ class Model {
         },
         url() {
           const url = _options.url
-            ? _options.url
+            ? typeof _options.url === 'function'
+              ? _options.url()
+              : _options.url
             : this.isNew
               ? this.basePath
               : this.urlRoot

src/tests/tests.js

@@ -22,6 +22,16 @@ export default (Vue, Model, User) => {
         })
     })
 
+    it('should be fetching the url :name/:id', () => {
+      expect(global.fetch.mock.calls[0][0])
+        .toBe('users/123')
+    })
+
+    it('should have updated url based on the model data', () => {
+      expect(model.url)
+        .toBe('tenants/593af5eae4e0554e76b71f8a')
+    })
+
     it('should resolve toJSON', () => {
       expect(model.toJSON())
         .toBeInstanceOf(Object)
@@ -210,4 +220,34 @@ export default (Vue, Model, User) => {
         .toBe('')
     })
   })
+
+  describe('VueModels - custom urls - function', () => {
+    const user = new User(null, {
+      url() {
+        return 'testtesttest'
+      }
+    })
+    it('should fetch via the custom url function', () => {
+      expect.assertions(1)
+      return user.fetch()
+        .then(() => {
+          expect(global.fetch.mock.calls[4][0])
+            .toBe('testtesttest')
+        })
+    })
+  })
+
+  describe('VueModels - custom urls - property', () => {
+    const user = new User(null, {
+      url: 'testproperty'
+    })
+    it('should fetch via the custom url function', () => {
+      expect.assertions(1)
+      return user.fetch()
+        .then(() => {
+          expect(global.fetch.mock.calls[5][0])
+            .toBe('testproperty')
+        })
+    })
+  })
 }