Merge pull request #2 from leaplegal/master

Dynamic routes are being loaded before static routes

index.js

@@ -4,11 +4,37 @@ var memo = {};
 
 module.exports = fsRoutes;
 
+function compare(a, b) {
+  var result;
+  a = {
+    dirname: path.dirname(a).replace(/^\./i, ''),
+    basename: path.basename(a).replace(/\:/i, '~')
+  };
+  b = {
+    dirname: path.dirname(b).replace(/^\./i, ''),
+    basename: path.basename(b).replace(/\:/i, '~')
+  };
+
+  if(a.dirname === b.dirname) {
+    result = -1;
+    if(a.basename > b.basename) {
+      result = 1;
+    }
+  } else {
+    result = 1;
+    if(a.dirname < b.dirname) {
+      result = -1;
+    }
+  }
+
+  return result
+}
+
 function fsRoutes(dir) {
   dir = path.resolve(process.cwd(), dir);
 
   if (!memo[dir]) {
-    memo[dir] = glob.sync('**/*.js', {cwd: dir}).map(function(file) {
+    memo[dir] = glob.sync('**/*.js', {cwd: dir}).sort(compare).map(function(file) {
       return {
         path: path.resolve(dir, file),
         route: '/' + file.replace(/\.js$/, '')

test.js

@@ -10,6 +10,14 @@ function assertRoutes(routes) {
       path: __dirname + '/test-dir/home.js',
       route: '/home'
     },
+    {
+      path: __dirname + '/test-dir/users/query.js',
+      route: '/users/query'
+    },
+    {
+      path: __dirname + '/test-dir/users/{id}.js',
+      route: '/users/{id}'
+    },
     {
       path: __dirname + '/test-dir/users/:id.js',
       route: '/users/:id'