Merge 0aaf0c4 into feb5c1f

README.md

@@ -2,6 +2,8 @@
 
 Simple route matcher using minimatch.
 
+[Changelog](https://github.com/cdimoulis/simple-routes/blob/master/changelog.md)
+
 [![npm][npm]][npm-url]
 [![node][node]][node-url]
 [![deps][deps]][deps-url]
@@ -46,7 +48,7 @@ router.addRoutes([
 
 router.hasRoute('/index.html'); // true
 
-let action = router.getAction('/blog/articles/cheese'); // returns main_controller.articles
+let action = router.getAction('/blog/articles/cheese'); // returns main_controller.articles, undefined if not found
 ```
 
 **NOTE:**
@@ -69,6 +71,16 @@ You can get an array of all the actions currently in the router:
 router.actions();
 ```
 
+Get the action if the passed route string matches a pattern. Undefined if not found:
+```js
+router.getAction('/...');
+```
+
+Get the route pattern that the passed route string matches. Undefined if not found:
+```js
+router.getRouteMatch('/...');
+```
+
 View a neater layout of the current routes in the router. If the function passed is a named function statement the function name will show. Otherwise the function will print.
 
 ```js

changelog.md

@@ -0,0 +1,11 @@
+2.1
+====
+
+* Added `getRouteMatch(...)` function to return the matched pattern.
+* Router `getAction(..)` function returns undefined if not found, not -1.
+
+
+2.0
+====
+
+* Converted simple-routes router to an extendible class.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-routes",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A simple route matcher",
   "keywords": [
     "router",

src/router.js

@@ -60,7 +60,18 @@ class Router {
     let rq = route.split('?');
     // Index of path only
     let index = _findMatch(rq[0]);
-    return _actions[index] || -1;
+    return _actions[index];
+  };
+
+  // Get the route patter that is matched
+
+  // Returns null if not found
+  getRouteMatch(route) {
+    // Separate potential query string
+    let rq = route.split('?');
+    // Index of path only
+    let index = _findMatch(rq[0]);
+    return _routes[index];
   };
 
   // Remove a route

test/router.spec.js

@@ -29,21 +29,34 @@ test('Add routes', () => {
   f.x = () => {return 3;};
   router.addRoutes([
     ['/test', action1],
-    ['/love', action2],
+    ['/love/*', action2],
     ['/temp', f.x],
   ]);
   let routes = router.routes();
   let actions = router.actions();
   expect(routes.length).toBe(3);
   expect(actions.length).toBe(3);
-  expect(routes[1]).toBe('/love');
+  expect(routes[1]).toBe('/love/*');
   expect(actions[1]).toBe(action2);
 });
 
 test('Get Action', () => {
   expect(router.getAction('/test')).toBe(action1);
-  expect(router.getAction('/love')).toBe(action2);
-  expect(router.getAction('/not_found')).toBe(-1);
+  expect(router.getAction('/love/food')).toBe(action2);
+  expect(router.getAction('/not_found')).toBeUndefined();
+});
+
+test('Get Route Match', () => {
+  router.addRoutes([
+    ['/a/b/*/c', action1],
+    ['/*/b/*/c', action1]
+  ]);
+  expect(router.getRouteMatch('/a/b/z/c')).toBe('/a/b/*/c');
+  expect(router.getRouteMatch('/x/b/z/c')).toBe('/*/b/*/c');
+  expect(router.getRouteMatch('/love/q')).toBe('/love/*');
+  expect(router.getRouteMatch('/a/b/z/c/d')).toBeUndefined();
+  router.removeRoute('/a/b/*/c');
+  router.removeRoute('/*/b/*/c');
 });
 
 test('Remove route', () => {
@@ -74,10 +87,14 @@ test('Remove route with query', () => {
 });
 
 test('Has Route', () => {
-  expect(router.hasRoute('/love')).toBeTruthy();
+  expect(router.hasRoute('/love/*')).toBeTruthy();
   expect(router.hasRoute('/not_found')).toBeFalsy();
 });
 
+test('Get Route Match', () => {
+  expect(router.getRouteMatch('/love/family')).toBe('/love/*')
+});
+
 test('To String', () => {
   expect(typeof router.toString()).toBe('string');
 });