Merge pull request #12 from ConjureLabs/routes.js

change to .routes.json config, and support .routes.js

README.md

@@ -261,7 +261,7 @@ const route = new Route({
 })
 ```
 
-You can also set these in `routes.json` files in the route tree. Configuration is resolved, and any inline configuration will override resolved values.
+You can also set these in `routes.json` or `routes.js` files in the route tree. Configuration is resolved, and any inline configuration will override resolved values.
 
 ```
 .

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conjurelabs/route",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Express routes made easy",
   "main": "index.js",
   "scripts": {

sync-crawl.js

@@ -16,7 +16,7 @@ const defaultVerbLookup = {
 }
 const startingDollarSign = /^\$/
 const jsFileExt = /\.js$/
-const confFile = /^routes.json$/i
+const confFile = /^\.routes\.js(?:on)?$/i
 
 class Logging {
   constructor() {
@@ -126,13 +126,13 @@ function syncCrawlRoutesDir(rootpath, options = {}) {
       const stat = fs.statSync(path.resolve(dirPath, resource))
 
       if (stat.isFile()) {
-        if (jsFileExt.test(resource)) {
-          files.push(resource)
+        if (confFile.test(resource)) {
+          confPaths = confPaths.concat(path.resolve(dirPath, resource))
           continue
         }
 
-        if (confFile.test(resource)) {
-          confPaths = confPaths.concat(path.resolve(dirPath, resource))
+        if (jsFileExt.test(resource)) {
+          files.push(resource)
           continue
         }
       }

test/sync-crawl/helpers/routes-12/.routes.js

@@ -0,0 +1,3 @@
+module.exports = {
+  wildcard: true
+}

test/sync-crawl/helpers/routes-12/with-wildcard/get.js

@@ -0,0 +1,9 @@
+const Route = require('../../../../../')
+
+const r = new Route()
+
+r.push((req, res) => {
+  res.send('TOP')
+})
+
+module.exports = r

test/sync-crawl/helpers/routes-12/with-wildcard/more-specific/get.js

@@ -0,0 +1,9 @@
+const Route = require('../../../../../../')
+
+const r = new Route()
+
+r.push((req, res) => {
+  res.send('SPECIFIC')
+})
+
+module.exports = r

test/sync-crawl/helpers/routes-12/without-wildcard/.routes.js

@@ -0,0 +1,3 @@
+module.exports = {
+  wildcard: false
+}

test/sync-crawl/helpers/routes-12/without-wildcard/get.js

@@ -0,0 +1,9 @@
+const Route = require('../../../../../')
+
+const r = new Route()
+
+r.push((req, res) => {
+  res.send('TOP')
+})
+
+module.exports = r

test/sync-crawl/helpers/routes-12/without-wildcard/more-specific/get.js

@@ -0,0 +1,9 @@
+const Route = require('../../../../../../')
+
+const r = new Route()
+
+r.push((req, res) => {
+  res.send('SPECIFIC')
+})
+
+module.exports = r

test/sync-crawl/index.js

@@ -433,3 +433,30 @@ test('should go throuh sepcific routes before param routes (II)', t => {
     }
   })
 })
+
+test('should honor multiple of one verb, ordered (IV)', t => {
+  const router = new Router()
+  router.use(crawl('routes-12'))
+
+  router.handle({ url: '/without-wildcard/more-specific', method: 'GET' }, {
+    send: val => {
+      t.is(val, 'SPECIFIC')
+    }
+  })
+  router.handle({ url: '/without-wildcard', method: 'GET' }, {
+    send: val => {
+      t.is(val, 'TOP')
+    }
+  })
+
+  router.handle({ url: '/with-wildcard/more-specific', method: 'GET' }, {
+    send: val => {
+      t.is(val, 'TOP')
+    }
+  })
+  router.handle({ url: '/with-wildcard', method: 'GET' }, {
+    send: val => {
+      t.is(val, 'TOP')
+    }
+  })
+})