From 4e2176f393fe2a6ccac222eb86e1c96cdfc9d04c Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 26 Nov 2016 23:04:47 -0500
Subject: [PATCH] Almost

---
 lib/src/router.dart   | 64 +++++++++++++++++++++++++++++--------------
 test/server_test.dart | 34 ++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/lib/src/router.dart b/lib/src/router.dart
index 42e0aa35..2793603f 100644
--- a/lib/src/router.dart
+++ b/lib/src/router.dart
@@ -66,8 +66,11 @@ class Router {
       if (route is! SymlinkRoute) {
         router._routes.add(route.clone());
       } else if (route is SymlinkRoute) {
-        router._routes.add(new SymlinkRoute(route.path, route.pattern,
-            newMounted[route.pattern] = route.router.clone()));
+        final newRouter = route.router.clone();
+        newMounted[route.path] = newRouter;
+        final symlink = new SymlinkRoute(route.path, route.pattern, newRouter)
+          .._head = route._head;
+        router._routes.add(symlink);
       }
     }
 
@@ -88,13 +91,14 @@ class Router {
       buf.writeln(header);
     }
 
+    buf.writeln('<root>');
+
     indent() {
       for (int i = 0; i < tabs; i++) buf.write(tab);
     }
 
     dumpRouter(Router router) {
       indent();
-      buf.writeln('- <root>');
       tabs++;
 
       for (Route route in router.routes) {
@@ -103,9 +107,7 @@ class Router {
 
         if (route is SymlinkRoute) {
           buf.writeln();
-          tabs++;
           dumpRouter(route.router);
-          tabs--;
         } else {
           if (showMatchers) buf.write(' (${route.matcher.pattern})');
 
@@ -231,44 +233,57 @@ class Router {
     requestMiddleware[name] = middleware;
   }
 
+  RoutingResult _dumpResult(String path, RoutingResult result) {
+    _printDebug('Resolved "/$path" to ${result.deepestRoute}');
+    return result;
+  }
+
   /// Finds the first [Route] that matches the given path,
   /// with the given method.
   RoutingResult resolve(String fullPath, String path, {String method: 'GET'}) {
     final cleanFullPath = fullPath.replaceAll(_straySlashes, '');
     final cleanPath = path.replaceAll(_straySlashes, '');
+    _printDebug(
+        'Now resolving $method "/$cleanPath", fullPath: $cleanFullPath');
 
     for (Route route in routes) {
       if (route is SymlinkRoute && route._head != null) {
-        final match = route._head.firstMatch(cleanFullPath);
+        final match = route._head.firstMatch(cleanPath);
 
         if (match != null) {
           final tail = cleanPath
-              .replaceFirst(match[0], '')
+              .replaceAll(route._head, '')
               .replaceAll(_straySlashes, '');
           _printDebug('Matched head "${match[0]}" to $route. Tail: "$tail"');
+          route.router.debug = route.router.debug || debug;
           final nested =
               route.router.resolve(cleanFullPath, tail, method: method);
-          return new RoutingResult(
-              match: match,
-              nested: nested,
-              params: route.parseParameters(cleanPath),
-              sourceRoute: route,
-              sourceRouter: this,
-              tail: tail);
+          return _dumpResult(
+              cleanPath,
+              new RoutingResult(
+                  match: match,
+                  nested: nested,
+                  params: route.parseParameters(cleanPath),
+                  sourceRoute: route,
+                  sourceRouter: this,
+                  tail: tail));
         }
       } else if (route.method == '*' || route.method == method) {
         final match = route.match(cleanPath);
 
         if (match != null) {
-          return new RoutingResult(
-              match: match,
-              params: route.parseParameters(cleanPath),
-              sourceRoute: route,
-              sourceRouter: this);
+          return _dumpResult(
+              cleanPath,
+              new RoutingResult(
+                  match: match,
+                  params: route.parseParameters(cleanPath),
+                  sourceRoute: route,
+                  sourceRouter: this));
         }
       }
     }
 
+    _printDebug('Could not resolve path "/$cleanPath".');
     return null;
   }
 
@@ -281,11 +296,17 @@ class Router {
     var result = router.resolve(fullPath, path, method: method);
 
     while (result != null) {
-      results.add(result);
+      if (!results.contains(result))
+        results.add(result);
+      else
+        break;
+
       result.deepestRouter._routes.remove(result.deepestRoute);
       result = router.resolve(fullPath, path, method: method);
     }
 
+    _printDebug(
+        'Results of $method "/${fullPath.replaceAll(_straySlashes, '')}": ${results.map((r) => r.deepestRoute).toList()}');
     return results;
   }
 
@@ -314,7 +335,8 @@ class Router {
           copiedMiddleware[middlewareName];
     }
 
-    final route = new SymlinkRoute(path, path, _mounted[path] = router);
+    final route = new SymlinkRoute(path, path, router);
+    _mounted[route.path] = router;
     _routes.add(route);
     route._head = new RegExp(route.matcher.pattern.replaceAll(_rgxEnd, ''));
 
diff --git a/test/server_test.dart b/test/server_test.dart
index 263aeccf..dc9d7837 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -46,6 +46,30 @@ main() {
     });
   });
 
+  final beatles = new Router();
+
+  beatles.post('/spinal_clacker', (req, res) {
+    res.write('come ');
+    return true;
+  });
+
+  final yellow = new Router()
+    ..get('/submarine', (req, res) {
+      res.write('we all live in a');
+      return false;
+    });
+
+  beatles.group('/big', (router) {
+    router.mount('/yellow', yellow);
+  });
+
+  beatles.all('*', (req, res) {
+    res.write('together');
+    return false;
+  });
+
+  router.mount('/beatles', beatles);
+
   setUp(() async {
     client = new http.Client();
 
@@ -122,5 +146,13 @@ main() {
     });
   });
 
-  group('use', () {});
+  group('mount', () {
+    group('path', () {
+      test('top-level', () async {
+        final res = await client.get('$url/beatles/spinal_clacker');
+        print('Response: ${res.body}');
+        expect(res.body, equals('come together'));
+      });
+    });
+  });
 }