fixed multi router, #4

examples/multi.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const Toa = require('toa')
+const Router = require('../')
+const app = new Toa()
+
+const router1 = new Router('/abc')
+router1.get('/:anything', function () {
+  this.body = this.params['anything']
+})
+
+const router2 = new Router('/abcd')
+router2.get('/:anything', function () {
+  this.body = this.params['anything']
+})
+
+app.use(router1.toThunk())
+app.use(router2.toThunk())
+
+app.listen(3000)

index.js

@@ -16,6 +16,7 @@ class Router {
     options = options || {}
     if (typeof options === 'string') options = {root: options}
     this.root = typeof options.root === 'string' ? options.root : '/'
+    if (!this.root.endsWith('/')) this.root += '/'
     this.trie = new Trie(options)
     this.middleware = []
     this._otherwise = null
@@ -54,8 +55,7 @@ class Router {
       this[ROUTED] = true
 
       if (router.root.length > 1) {
-        path = path.slice(router.root.length)
-        if (!path) path = '/'
+        path = path.slice(router.root.length - 1)
       }
 
       let matched = router.trie.match(path)
@@ -64,7 +64,7 @@ class Router {
           let url = matched.tsr
           if (matched.fpr) url = matched.fpr
           if (router.root.length > 1) {
-            url = router.root + url
+            url = router.root + url.slice(1)
           }
           this.path = url
 

package.json

@@ -4,7 +4,7 @@
   "authors": [
     "Yan Qing <[email protected]>"
   ],
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "index.js",
   "repository": {
     "type": "git",
@@ -28,10 +28,10 @@
   },
   "devDependencies": {
     "istanbul": "^0.4.5",
-    "standard": "^9.0.2",
+    "standard": "^10.0.2",
     "supertest": "^3.0.0",
     "tman": "^1.6.6",
-    "toa": "^2.6.2"
+    "toa": "^2.6.4"
   },
   "scripts": {
     "test": "standard && tman",

test/index.js

@@ -43,7 +43,7 @@ tman.suite('toa-router', function () {
 
     yield request(server)
       .get('/api')
-      .expect(501)
+      .expect(421)
     assert.strictEqual(called, 0)
 
     yield request(server)
@@ -632,4 +632,46 @@ tman.suite('toa-router', function () {
       .expect('some error')
     assert.strictEqual(count, 0)
   })
+
+  tman.it('multi-router', function * () {
+    let Toa = require('toa')
+    let app = new Toa()
+
+    let router1 = new Router('/abc')
+    router1.get('/:anything', function () {
+      this.body = this.params['anything']
+    })
+
+    let router2 = new Router('/abcd')
+    router2.get('/:anything', function () {
+      this.body = this.params['anything']
+    })
+
+    app.use(router1.toThunk())
+    app.use(router2.toThunk())
+
+    app.onerror = () => {}
+    let server = app.listen()
+
+    yield request(server).get('/')
+      .expect(421)
+    yield request(server).get('/abc')
+      .expect(421)
+    yield request(server).get('/abcd')
+      .expect(421)
+
+    yield request(server).get('/abc/')
+      .expect(200)
+      .expect('')
+    yield request(server).get('/abc/123')
+      .expect(200)
+      .expect('123')
+
+    yield request(server).get('/abcd/')
+      .expect(200)
+      .expect('')
+    yield request(server).get('/abcd/123')
+      .expect(200)
+      .expect('123')
+  })
 })