mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed debug messages!!!

Browse source
This commit is contained in:
thosakwe 2017-06-06 08:48:55 -04:00
parent 9ac7a8e904
commit 092cda9fec
5 changed files with 40 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/angel_route.iml
View file

@ -16,7 +16,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="application" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>

2
README.md
View file

@ -1,6 +1,6 @@
# angel_route
![version 1.0.3](https://img.shields.io/badge/version-1.0.3-brightgreen.svg)
![version 1.0.4](https://img.shields.io/badge/version-1.0.4-brightgreen.svg)
![build status](https://travis-ci.org/angel-dart/route.svg)
A powerful, isomorphic routing library for Dart.

66
lib/src/route.dart
View file

@ -126,10 +126,6 @@ class Route {
orElse: () => this);
}
void _printDebug(msg) {
// if (debug == true) print(msg);
}
Route._base();
Route(Pattern path,
@ -346,20 +342,20 @@ class Route {
Iterable<String> values =
_parseParameters(requestPath.replaceAll(_straySlashes, ''));
_printDebug(
'Searched request path $requestPath and found these values: $values');
_printDebug('This route\'s path is "$path".');
// _printDebug(
// 'Searched request path $requestPath and found these values: $values');
// _printDebug('This route\'s path is "$path".');
final pathString = _pathify(path).replaceAll(new RegExp('\/'), r'\/');
Iterable<Match> matches = _param.allMatches(pathString);
_printDebug(
'All param names parsed in "$pathString": ${matches.map((m) => m[1])}');
// _printDebug(
// 'All param names parsed in "$pathString": ${matches.map((m) => m[1])}');
for (int i = 0; i < matches.length && i < values.length; i++) {
Match match = matches.elementAt(i);
String paramName = match.group(1);
String value = values.elementAt(i);
_printDebug('Setting param "$paramName" to "$value"...');
// _printDebug('Setting param "$paramName" to "$value"...');
result[paramName] = value;
}
@ -378,16 +374,16 @@ class Route {
///
/// Can be used to navigate a route hierarchy like a file system.
Route resolve(String path, {bool filter(Route route), String fullPath}) {
_printDebug(
'Path to resolve: "/${path.replaceAll(_straySlashes, '')}", our matcher: ${matcher.pattern}');
// _printDebug(
// 'Path to resolve: "/${path.replaceAll(_straySlashes, '')}", our matcher: ${matcher.pattern}');
bool _filter(route) {
if (filter == null) {
_printDebug('No filter provided, returning true for $route');
// _printDebug('No filter provided, returning true for $route');
return true;
} else {
_printDebug('Running filter on $route');
// _printDebug('Running filter on $route');
final result = filter(route);
_printDebug('Filter result: $result');
// _printDebug('Filter result: $result');
return result;
}
}
@ -396,7 +392,7 @@ class Route {
if ((path.isEmpty || path == '.') && _filter(indexRoute)) {
// Try to find index
_printDebug('Empty path, resolving with indexRoute: $indexRoute');
// _printDebug('Empty path, resolving with indexRoute: $indexRoute');
return indexRoute;
} else if (path == '/') {
return absoluteParent.resolve('');
@ -409,8 +405,8 @@ class Route {
}
if (_filter(indexRoute)) {
_printDebug(
'Path "/$path" is technically empty, sending to indexRoute: $indexRoute');
// _printDebug(
// 'Path "/$path" is technically empty, sending to indexRoute: $indexRoute');
return indexRoute;
} else
return null;
@ -427,15 +423,15 @@ class Route {
filter: _filter, fullPath: _fullPath);
} else if (matcher.hasMatch(path.replaceAll(_straySlashes, '')) ||
_resolver.hasMatch(path.replaceAll(_straySlashes, ''))) {
_printDebug(
'Path "/$path" matched our matcher, sending to indexRoute: $indexRoute');
// _printDebug(
// 'Path "/$path" matched our matcher, sending to indexRoute: $indexRoute');
return indexRoute;
} else {
final segments = path.split('/').where((str) => str.isNotEmpty).toList();
_printDebug('Segments: $segments on "/${this.path}"');
// _printDebug('Segments: $segments on "/${this.path}"');
if (segments.isEmpty) {
_printDebug('Empty segments, sending to indexRoute: $indexRoute');
// _printDebug('Empty segments, sending to indexRoute: $indexRoute');
return indexRoute;
}
@ -452,8 +448,8 @@ class Route {
for (Route route in children) {
final subPath = '${this.path}/${segments[0]}';
_printDebug(
'seg0: ${segments[0]}, stub: ${route._stub?.pattern}, path: $path, route.path: ${route.path}, route.matcher: ${route.matcher.pattern}, this.matcher: ${matcher.pattern}');
// _printDebug(
// 'seg0: ${segments[0]}, stub: ${route._stub?.pattern}, path: $path, route.path: ${route.path}, route.matcher: ${route.matcher.pattern}, this.matcher: ${matcher.pattern}');
if (route.match(subPath) != null ||
route._resolver.firstMatch(subPath) != null) {
@ -468,11 +464,11 @@ class Route {
}
} else if (route._stub != null && route._stub.hasMatch(segments[0])) {
if (segments.length == 1) {
_printDebug('Stub perhaps matches');
// _printDebug('Stub perhaps matches');
return route.resolve('');
} else {
_printDebug(
'Maybe stub matches. Sending remaining segments to $route');
// _printDebug(
// 'Maybe stub matches. Sending remaining segments to $route');
return route.resolve(segments.skip(1).join('/'));
}
}
@ -480,14 +476,14 @@ class Route {
// Try to match "subdirectory"
for (Route route in children) {
_printDebug(
'Trying to match subdir for $path; child ${route.path} on ${this.path}');
// _printDebug(
// 'Trying to match subdir for $path; child ${route.path} on ${this.path}');
final match = route._parentResolver.firstMatch(path);
if (match != null) {
final subPath =
path.replaceFirst(match[0], '').replaceAll(_straySlashes, '');
_printDebug("Subdir path: $subPath");
// _printDebug("Subdir path: $subPath");
for (Route child in route.children) {
final testPath = child.path
@ -506,24 +502,24 @@ class Route {
// Try to match the whole route, if nothing else works
for (Route route in children) {
_printDebug(
'Trying to match full $_fullPath for ${route.path} on ${this.path}');
// _printDebug(
// 'Trying to match full $_fullPath for ${route.path} on ${this.path}');
if ((route.match(_fullPath) != null ||
route._resolver.firstMatch(_fullPath) != null) &&
_filter(route)) {
_printDebug('Matched full path!');
// _printDebug('Matched full path!');
return route.resolve('');
} else if ((route.match('/$_fullPath') != null ||
route._resolver.firstMatch('/$_fullPath') != null) &&
_filter(route)) {
_printDebug('Matched full path (with a leading slash!)');
// _printDebug('Matched full path (with a leading slash!)');
return route.resolve('');
}
}
// Lastly, check to see if we have an index route to resolve with
if (indexRoute != this) {
_printDebug('Forwarding "/$path" to indexRoute');
// _printDebug('Forwarding "/$path" to indexRoute');
return indexRoute.resolve(path);
}

16
lib/src/router.dart
View file

@ -44,10 +44,6 @@ class Router extends Extensible {
/// Not recommended.
Router({this.debug: false});
void _printDebug(msg) {
// if (debug == true) print(msg);
}
/// Adds a route that responds to the given path
/// for requests with the given method (case-insensitive).
/// Provide '*' as the method to respond to all methods.
@ -257,7 +253,7 @@ class Router extends Extensible {
}
RoutingResult _dumpResult(String path, RoutingResult result) {
_printDebug('Resolved "/$path" to ${result.route}');
// _printDebug('Resolved "/$path" to ${result.route}');
return result;
}
@ -287,9 +283,9 @@ class Router extends Extensible {
.replaceAll(_straySlashes, '');
if (cleaned.isEmpty) {
_printDebug(
'Matched relative "$cleanRelative" to head ${route._head
.pattern} on $route. Tail: "$tail"');
// _printDebug(
// 'Matched relative "$cleanRelative" to head ${route._head
// .pattern} on $route. Tail: "$tail"');
route.router.debug = route.router.debug || debug;
final nested =
route.router.resolve(cleanAbsolute, tail, method: method);
@ -345,8 +341,8 @@ class Router extends Extensible {
result = router.resolve(absolute, relative, method: method);
}
_printDebug(
'Results of $method "/${absolute.replaceAll(_straySlashes, '')}": ${results.map((r) => r.route).toList()}');
// _printDebug(
// 'Results of $method "/${absolute.replaceAll(_straySlashes, '')}": ${results.map((r) => r.route).toList()}');
return results;
}

2
pubspec.yaml
View file

@ -1,6 +1,6 @@
name: angel_route
description: A powerful, isomorphic routing library for Dart.
version: 1.0.3
version: 1.0.4
author: Tobe O <thosakwe@gmail.com>
homepage: https://github.com/angel-dart/angel_route
dev_dependencies: