Tweak table() api. Closes hapijs#2262

hueniverse · hueniverse · commit 43869ff7d832 · 2014-12-06T23:06:47.000-08:00
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -416,10 +416,10 @@ internals.Plugin.prototype.state = function (name, options) {
 
 internals.Plugin.prototype.table = function (host) {
 
-    var table = {};
+    var table = [];
     for (var i = 0, il = this.connections.length; i < il; ++i) {
         var connection = this.connections[i];
-        table[connection.info.uri] = connection.table(host);
+        table.push({ info: connection.info, labels: connection.settings.lables, table: connection.table(host) });
     }
 
     return table;
diff --git a/test/connection.js b/test/connection.js
@@ -598,7 +598,7 @@ describe('Connection', function () {
             server.route({ path: '/test/', method: 'get', handler: function () { } });
             server.route({ path: '/test/{p}/end', method: 'get', handler: function () { } });
 
-            var routes = server.table()[server.info.uri];
+            var routes = server.table()[0].table;
 
             expect(routes.length).to.equal(2);
             expect(routes[0].path).to.equal('/test/');
@@ -630,7 +630,7 @@ describe('Connection', function () {
             server.route({ path: '/test/', vhost: 'two.example.com', method: 'get', handler: function () { } });
             server.route({ path: '/test/{p}/end', method: 'get', handler: function () { } });
 
-            var routes = server.table()[server.info.uri];
+            var routes = server.table()[0].table;
 
             expect(routes.length).to.equal(4);
             done();
@@ -646,7 +646,7 @@ describe('Connection', function () {
             server.route({ path: '/test/', vhost: 'two.example.com', method: 'get', handler: function () { } });
             server.route({ path: '/test/{p}/end', method: 'get', handler: function () { } });
 
-            var routes = server.table('one.example.com')[server.info.uri];
+            var routes = server.table('one.example.com')[0].table;
 
             expect(routes.length).to.equal(3);
             done();
@@ -662,7 +662,7 @@ describe('Connection', function () {
             server.route({ path: '/test/', vhost: 'two.example.com', method: 'get', handler: function () { } });
             server.route({ path: '/test/{p}/end', method: 'get', handler: function () { } });
 
-            var routes = server.table(['one.example.com', 'two.example.com'])[server.info.uri];
+            var routes = server.table(['one.example.com', 'two.example.com'])[0].table;
 
             expect(routes.length).to.equal(4);
             done();
@@ -678,7 +678,7 @@ describe('Connection', function () {
             server.route({ path: '/test/', vhost: 'two.example.com', method: 'get', handler: function () { } });
             server.route({ path: '/test/{p}/end', method: 'get', handler: function () { } });
 
-            var routes = server.table('three.example.com')[server.info.uri];
+            var routes = server.table('three.example.com')[0].table;
 
             expect(routes.length).to.equal(2);
             done();
@@ -1083,7 +1083,7 @@ describe('Connection', function () {
                 }
             ]);
 
-            var table = server.table()[server.info.uri];
+            var table = server.table()[0].table;
             var paths = table.map(function (route) {
                 var obj = {
                     method: route.method,
diff --git a/test/plugin.js b/test/plugin.js
@@ -2181,12 +2181,11 @@ describe('Plugin', function () {
 
 internals.routesList = function (server, label) {
 
-    var table = server.select(label || []).table();
-    var connections = Object.keys(table);
+    var tables = server.select(label || []).table();
 
     var list = [];
-    for (var c = 0, cl = connections.length; c < cl; ++c) {
-        var routes = table[connections[c]];
+    for (var c = 0, cl = tables.length; c < cl; ++c) {
+        var routes = tables[c].table;
         for (var i = 0, il = routes.length; i < il; ++i) {
             var route = routes[i];
             if (route.method === 'get') {
