Skip to content

Commit 471e0ca

Browse files
RomainLanzRomainLanz
authored
refactor: use destroy handler instead of delete (#14)
1 parent d4c8d45 commit 471e0ca

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎src/Router/Resource.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export class RouteResource extends Macroable implements RouteResourceContract {
8888
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['GET'], 'show')
8989
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id/edit`, ['GET'], 'edit')
9090
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['PUT', 'PATCH'], 'update')
91-
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['DELETE'], 'delete')
91+
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['DELETE'], 'destroy')
9292
}
9393

9494
/**

‎test/group.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ test.group('Route Group', () => {
220220
methods: ['DELETE'],
221221
domain: 'root',
222222
middleware: [],
223-
handler: 'PhotosController.delete',
224-
name: 'photos.delete',
223+
handler: 'PhotosController.destroy',
224+
name: 'photos.destroy',
225225
},
226226
])
227227
})
@@ -313,8 +313,8 @@ test.group('Route Group', () => {
313313
methods: ['DELETE'],
314314
domain: 'root',
315315
middleware: [],
316-
handler: 'PhotosController.delete',
317-
name: 'v1.photos.delete',
316+
handler: 'PhotosController.destroy',
317+
name: 'v1.photos.destroy',
318318
},
319319
])
320320
})

‎test/resource.spec.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ test.group('Route Resource', () => {
9696
methods: ['DELETE'],
9797
domain: 'root',
9898
middleware: [],
99-
handler: 'PhotosController.delete',
100-
name: 'photos.delete',
99+
handler: 'PhotosController.destroy',
100+
name: 'photos.destroy',
101101
},
102102
])
103103
})
@@ -187,8 +187,8 @@ test.group('Route Resource', () => {
187187
},
188188
domain: 'root',
189189
middleware: [],
190-
handler: 'AdsController.delete',
191-
name: 'magazines.ads.delete',
190+
handler: 'AdsController.destroy',
191+
name: 'magazines.ads.destroy',
192192
},
193193
])
194194
})
@@ -278,8 +278,8 @@ test.group('Route Resource', () => {
278278
methods: ['DELETE'],
279279
domain: 'root',
280280
middleware: [],
281-
handler: 'AdsController.delete',
282-
name: 'magazines.ads.delete',
281+
handler: 'AdsController.destroy',
282+
name: 'magazines.ads.destroy',
283283
},
284284
])
285285
})
@@ -302,7 +302,7 @@ test.group('Route Resource', () => {
302302
assert.isFalse(resource.routes.find((route) => route.name === 'photos.show')!.deleted)
303303
assert.isTrue(resource.routes.find((route) => route.name === 'photos.edit')!.deleted)
304304
assert.isTrue(resource.routes.find((route) => route.name === 'photos.update')!.deleted)
305-
assert.isTrue(resource.routes.find((route) => route.name === 'photos.delete')!.deleted)
305+
assert.isTrue(resource.routes.find((route) => route.name === 'photos.destroy')!.deleted)
306306
})
307307

308308
test('mark all defined as delete', (assert) => {
@@ -315,7 +315,7 @@ test.group('Route Resource', () => {
315315
assert.isTrue(resource.routes.find((route) => route.name === 'photos.show')!.deleted)
316316
assert.isFalse(resource.routes.find((route) => route.name === 'photos.edit')!.deleted)
317317
assert.isFalse(resource.routes.find((route) => route.name === 'photos.update')!.deleted)
318-
assert.isFalse(resource.routes.find((route) => route.name === 'photos.delete')!.deleted)
318+
assert.isFalse(resource.routes.find((route) => route.name === 'photos.destroy')!.deleted)
319319
})
320320

321321
test('define middleware on routes', (assert) => {
@@ -356,7 +356,7 @@ test.group('Route Resource', () => {
356356
)
357357

358358
assert.deepEqual(
359-
resource.routes.find((route) => route.name === 'photos.delete')!['routeMiddleware'],
359+
resource.routes.find((route) => route.name === 'photos.destroy')!['routeMiddleware'],
360360
[],
361361
)
362362
})
@@ -408,7 +408,7 @@ test.group('Route Resource', () => {
408408
)
409409

410410
assert.deepEqual(
411-
resource.routes.find((route) => route.name === 'photos.delete')!['matchers'],
411+
resource.routes.find((route) => route.name === 'photos.destroy')!['matchers'],
412412
{
413413
id: /[a-z]/,
414414
},
@@ -515,8 +515,8 @@ test.group('Route Resource', () => {
515515
methods: ['DELETE'],
516516
domain: 'root',
517517
middleware: [],
518-
handler: 'PhotosController.delete',
519-
name: 'photos.delete',
518+
handler: 'PhotosController.destroy',
519+
name: 'photos.destroy',
520520
},
521521
])
522522
})
@@ -606,8 +606,8 @@ test.group('Route Resource', () => {
606606
methods: ['DELETE'],
607607
domain: 'root',
608608
middleware: [],
609-
handler: 'ProfileController.delete',
610-
name: 'user_profile.delete',
609+
handler: 'ProfileController.destroy',
610+
name: 'user_profile.destroy',
611611
},
612612
])
613613
})
@@ -697,8 +697,8 @@ test.group('Route Resource', () => {
697697
methods: ['DELETE'],
698698
domain: 'root',
699699
middleware: [],
700-
handler: 'CommentsController.delete',
701-
name: 'user_profile.comments.delete',
700+
handler: 'CommentsController.destroy',
701+
name: 'user_profile.comments.destroy',
702702
},
703703
])
704704
})
@@ -719,7 +719,7 @@ test.group('Route Resource', () => {
719719
'photos.show': ['auth'],
720720
'photos.edit': ['auth'],
721721
'photos.update': ['auth'],
722-
'photos.delete': ['auth'],
722+
'photos.destroy': ['auth'],
723723
})
724724
})
725725

@@ -739,7 +739,7 @@ test.group('Route Resource', () => {
739739
'photos.show': ['auth'],
740740
'photos.edit': ['auth'],
741741
'photos.update': ['auth', 'self'],
742-
'photos.delete': ['auth'],
742+
'photos.destroy': ['auth'],
743743
})
744744
})
745745

@@ -754,7 +754,7 @@ test.group('Route Resource', () => {
754754
'public_photos.show',
755755
'public_photos.edit',
756756
'public_photos.update',
757-
'public_photos.delete',
757+
'public_photos.destroy',
758758
])
759759
})
760760

@@ -769,7 +769,7 @@ test.group('Route Resource', () => {
769769
'photos.show',
770770
'photos.edit',
771771
'photos.update',
772-
'photos.delete',
772+
'photos.destroy',
773773
])
774774
})
775775
})

‎test/router.spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test.group('Router | add', () => {
3838
const postRoute = router.post('/', 'HomeController.store')
3939
const putRoute = router.put('/', 'HomeController.update')
4040
const patchRoute = router.patch('/', 'HomeController.updatePatch')
41-
const deleteRoute = router.delete('/', 'HomeController.delete')
41+
const deleteRoute = router.delete('/', 'HomeController.destroy')
4242
const anyRoute = router.any('/', 'HomeController.handle')
4343

4444
assert.deepEqual(getRoute.toJSON(), {
@@ -101,7 +101,7 @@ test.group('Router | add', () => {
101101
},
102102
matchers: {},
103103
domain: 'root',
104-
handler: 'HomeController.delete',
104+
handler: 'HomeController.destroy',
105105
middleware: [],
106106
name: undefined,
107107
})
@@ -829,12 +829,12 @@ test.group('Router | commit', () => {
829829
routes: {
830830
'/api/posts/:id': {
831831
pattern: '/api/posts/:id',
832-
handler: 'PostController.delete',
832+
handler: 'PostController.destroy',
833833
meta: {
834834
namespace: undefined,
835835
},
836836
middleware: [],
837-
name: 'posts.delete',
837+
name: 'posts.destroy',
838838
},
839839
},
840840
},
@@ -1163,12 +1163,12 @@ test.group('Router | commit', () => {
11631163
routes: {
11641164
'/api/v1/posts/:id': {
11651165
pattern: '/api/v1/posts/:id',
1166-
handler: 'PostController.delete',
1166+
handler: 'PostController.destroy',
11671167
meta: {
11681168
namespace: undefined,
11691169
},
11701170
middleware: [],
1171-
name: 'posts.delete',
1171+
name: 'posts.destroy',
11721172
},
11731173
},
11741174
},
@@ -1435,12 +1435,12 @@ test.group('Router | commit', () => {
14351435
routes: {
14361436
'/comments/:id': {
14371437
pattern: '/comments/:id',
1438-
handler: 'CommentsController.delete',
1438+
handler: 'CommentsController.destroy',
14391439
meta: {
14401440
namespace: undefined,
14411441
},
14421442
middleware: [],
1443-
name: 'posts.comments.delete',
1443+
name: 'posts.comments.destroy',
14441444
},
14451445
},
14461446
},
@@ -1818,8 +1818,8 @@ test.group('Router | match', () => {
18181818
},
18191819
middleware: [],
18201820
pattern: '/photos/:id',
1821-
name: 'photos.delete',
1822-
handler: 'PhotosController.delete',
1821+
name: 'photos.destroy',
1822+
handler: 'PhotosController.destroy',
18231823
},
18241824
routeKey: 'DELETE-/photos/:id',
18251825
subdomains: {},

0 commit comments

Comments
 (0)