source formatting
diff --git a/example/example_server.dart b/example/example_server.dart
index 9182e32..def7c6b 100644
--- a/example/example_server.dart
+++ b/example/example_server.dart
@@ -20,8 +20,8 @@
pipeline = pipeline.addMiddleware(shelf.logRequests());
}
- var handler = pipeline.addHandler(createStaticHandler('example/files',
- defaultDocument: 'index.html'));
+ var handler = pipeline.addHandler(
+ createStaticHandler('example/files', defaultDocument: 'index.html'));
io.serve(handler, 'localhost', 8080).then((server) {
print('Serving at http://${server.address.host}:${server.port}');
@@ -29,4 +29,4 @@
}
ArgParser _getParser() => new ArgParser()
- ..addFlag('logging', abbr: 'l', defaultsTo: true, negatable: true);
+ ..addFlag('logging', abbr: 'l', defaultsTo: true, negatable: true);
diff --git a/lib/src/static_handler.dart b/lib/src/static_handler.dart
index a5822cf..73c50b1 100644
--- a/lib/src/static_handler.dart
+++ b/lib/src/static_handler.dart
@@ -71,8 +71,12 @@
// path doesn't end with '/', redirect to the path with a trailing '/'
var uri = request.requestedUri;
assert(!uri.path.endsWith('/'));
- var location = new Uri(scheme: uri.scheme, userInfo: uri.userInfo,
- host: uri.host, port: uri.port, path: uri.path + '/',
+ var location = new Uri(
+ scheme: uri.scheme,
+ userInfo: uri.userInfo,
+ host: uri.host,
+ port: uri.port,
+ path: uri.path + '/',
query: uri.query);
return new Response.movedPermanently(location.toString());
diff --git a/test/alternative_root_test.dart b/test/alternative_root_test.dart
index 0d40964..e89a7c4 100644
--- a/test/alternative_root_test.dart
+++ b/test/alternative_root_test.dart
@@ -18,10 +18,12 @@
});
d.file('root.txt', 'root txt').create();
- d.dir('files', [
- d.file('test.txt', 'test txt content'),
- d.file('with space.txt', 'with space content')
- ]).create();
+ d
+ .dir('files', [
+ d.file('test.txt', 'test txt content'),
+ d.file('with space.txt', 'with space content')
+ ])
+ .create();
currentSchedule.onComplete.schedule(() {
d.defaultRoot = null;
@@ -85,8 +87,8 @@
schedule(() {
var handler = createStaticHandler(d.defaultRoot);
- return makeRequest(handler, '/static/not_here.txt',
- scriptName: '/static').then((response) {
+ return makeRequest(handler, '/static/not_here.txt', scriptName: '/static')
+ .then((response) {
expect(response.statusCode, HttpStatus.NOT_FOUND);
});
});
diff --git a/test/basic_file_test.dart b/test/basic_file_test.dart
index f019684..a61fcb9 100644
--- a/test/basic_file_test.dart
+++ b/test/basic_file_test.dart
@@ -22,10 +22,12 @@
d.file('index.html', '<html></html>').create();
d.file('root.txt', 'root txt').create();
d.file('random.unknown', 'no clue').create();
- d.dir('files', [
- d.file('test.txt', 'test txt content'),
- d.file('with space.txt', 'with space content')
- ]).create();
+ d
+ .dir('files', [
+ d.file('test.txt', 'test txt content'),
+ d.file('with space.txt', 'with space content')
+ ])
+ .create();
currentSchedule.onComplete.schedule(() {
d.defaultRoot = null;
@@ -112,12 +114,10 @@
var rootPath = p.join(d.defaultRoot, 'root.txt');
var modified = new File(rootPath).statSync().changed.toUtc();
- var headers = {
- HttpHeaders.IF_MODIFIED_SINCE: formatHttpDate(modified)
- };
+ var headers = {HttpHeaders.IF_MODIFIED_SINCE: formatHttpDate(modified)};
- return makeRequest(handler, '/root.txt', headers: headers)
- .then((response) {
+ return makeRequest(handler, '/root.txt', headers: headers).then(
+ (response) {
expect(response.statusCode, HttpStatus.NOT_MODIFIED);
expect(response.contentLength, isNull);
});
@@ -133,11 +133,11 @@
var headers = {
HttpHeaders.IF_MODIFIED_SINCE:
- formatHttpDate(modified.subtract(const Duration(seconds: 1)))
+ formatHttpDate(modified.subtract(const Duration(seconds: 1)))
};
- return makeRequest(handler, '/root.txt', headers: headers)
- .then((response) {
+ return makeRequest(handler, '/root.txt', headers: headers).then(
+ (response) {
expect(response.statusCode, HttpStatus.OK);
expect(response.lastModified, atSameTimeToSecond(modified));
});
@@ -153,11 +153,11 @@
var headers = {
HttpHeaders.IF_MODIFIED_SINCE:
- formatHttpDate(modified.add(const Duration(seconds: 1)))
+ formatHttpDate(modified.add(const Duration(seconds: 1)))
};
- return makeRequest(handler, '/root.txt', headers: headers)
- .then((response) {
+ return makeRequest(handler, '/root.txt', headers: headers).then(
+ (response) {
expect(response.statusCode, HttpStatus.NOT_MODIFIED);
expect(response.contentLength, isNull);
});
diff --git a/test/default_document_test.dart b/test/default_document_test.dart
index 5d2ed1f..8e8adba 100644
--- a/test/default_document_test.dart
+++ b/test/default_document_test.dart
@@ -21,10 +21,12 @@
d.file('index.html', '<html></html>').create();
d.file('root.txt', 'root txt').create();
- d.dir('files', [
- d.file('index.html', '<html><body>files</body></html>'),
- d.file('with space.txt', 'with space content')
- ]).create();
+ d
+ .dir('files', [
+ d.file('index.html', '<html><body>files</body></html>'),
+ d.file('with space.txt', 'with space content')
+ ])
+ .create();
currentSchedule.onComplete.schedule(() {
d.defaultRoot = null;
@@ -34,10 +36,15 @@
group('default document value', () {
test('cannot contain slashes', () {
- var invalidValues = ['file/foo.txt', '/bar.txt', '//bar.txt',
- '//news/bar.txt', 'foo/../bar.txt'];
+ var invalidValues = [
+ 'file/foo.txt',
+ '/bar.txt',
+ '//bar.txt',
+ '//news/bar.txt',
+ 'foo/../bar.txt'
+ ];
- for(var val in invalidValues) {
+ for (var val in invalidValues) {
expect(() => createStaticHandler(d.defaultRoot, defaultDocument: val),
throwsArgumentError);
}
@@ -91,8 +98,8 @@
group('default document specified', () {
test('access "/index.html"', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- defaultDocument: 'index.html');
+ var handler =
+ createStaticHandler(d.defaultRoot, defaultDocument: 'index.html');
return makeRequest(handler, '/index.html').then((response) {
expect(response.statusCode, HttpStatus.OK);
@@ -105,8 +112,8 @@
test('access "/"', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- defaultDocument: 'index.html');
+ var handler =
+ createStaticHandler(d.defaultRoot, defaultDocument: 'index.html');
return makeRequest(handler, '/').then((response) {
expect(response.statusCode, HttpStatus.OK);
@@ -119,8 +126,8 @@
test('access "/files"', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- defaultDocument: 'index.html');
+ var handler =
+ createStaticHandler(d.defaultRoot, defaultDocument: 'index.html');
return makeRequest(handler, '/files').then((response) {
expect(response.statusCode, HttpStatus.MOVED_PERMANENTLY);
@@ -132,8 +139,8 @@
test('access "/files/" dir', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- defaultDocument: 'index.html');
+ var handler =
+ createStaticHandler(d.defaultRoot, defaultDocument: 'index.html');
return makeRequest(handler, '/files/').then((response) {
expect(response.statusCode, HttpStatus.OK);
diff --git a/test/get_handler_test.dart b/test/get_handler_test.dart
index b88b013..0f186e8 100644
--- a/test/get_handler_test.dart
+++ b/test/get_handler_test.dart
@@ -18,10 +18,12 @@
});
d.file('root.txt', 'root txt').create();
- d.dir('files', [
- d.file('test.txt', 'test txt content'),
- d.file('with space.txt', 'with space content')
- ]).create();
+ d
+ .dir('files', [
+ d.file('test.txt', 'test txt content'),
+ d.file('with space.txt', 'with space content')
+ ])
+ .create();
currentSchedule.onComplete.schedule(() {
d.defaultRoot = null;
@@ -45,7 +47,8 @@
test('non-existent absolute path', () {
schedule(() {
var nonExistingAbsolute = p.join(d.defaultRoot, 'not_here');
- expect(() => createStaticHandler(nonExistingAbsolute), throwsArgumentError);
+ expect(
+ () => createStaticHandler(nonExistingAbsolute), throwsArgumentError);
});
});
diff --git a/test/symbolic_link_test.dart b/test/symbolic_link_test.dart
index e25dfc1..2e1459e 100644
--- a/test/symbolic_link_test.dart
+++ b/test/symbolic_link_test.dart
@@ -18,9 +18,7 @@
});
});
- d.dir('originals', [
- d.file('index.html', '<html></html>'),
- ]).create();
+ d.dir('originals', [d.file('index.html', '<html></html>'),]).create();
d.dir('alt_root').create();
@@ -111,8 +109,8 @@
group('access outside of root enabled', () {
test('access real file', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- serveFilesOutsidePath: true);
+ var handler =
+ createStaticHandler(d.defaultRoot, serveFilesOutsidePath: true);
return makeRequest(handler, '/originals/index.html').then((response) {
expect(response.statusCode, HttpStatus.OK);
@@ -125,8 +123,8 @@
group('links under root dir', () {
test('access sym linked file in real dir', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- serveFilesOutsidePath: true);
+ var handler =
+ createStaticHandler(d.defaultRoot, serveFilesOutsidePath: true);
return makeRequest(handler, '/link_index.html').then((response) {
expect(response.statusCode, HttpStatus.OK);
@@ -138,8 +136,8 @@
test('access file in sym linked dir', () {
schedule(() {
- var handler = createStaticHandler(d.defaultRoot,
- serveFilesOutsidePath: true);
+ var handler =
+ createStaticHandler(d.defaultRoot, serveFilesOutsidePath: true);
return makeRequest(handler, '/link_dir/index.html').then((response) {
expect(response.statusCode, HttpStatus.OK);
diff --git a/test/test_util.dart b/test/test_util.dart
index cbd7544..3e17d87 100644
--- a/test/test_util.dart
+++ b/test/test_util.dart
@@ -50,8 +50,8 @@
class _SecondResolutionDateTimeMatcher extends Matcher {
final DateTime _target;
- _SecondResolutionDateTimeMatcher(DateTime target) :
- this._target = toSecondResolution(target);
+ _SecondResolutionDateTimeMatcher(DateTime target)
+ : this._target = toSecondResolution(target);
bool matches(item, Map matchState) {
if (item is! DateTime) return false;
@@ -59,9 +59,9 @@
return datesEqualToSecond(_target, item);
}
- Description describe(Description descirption) =>
- descirption.add('Must be at the same moment as $_target with resolution '
- 'to the second.');
+ Description describe(Description descirption) => descirption.add(
+ 'Must be at the same moment as $_target with resolution '
+ 'to the second.');
}
bool datesEqualToSecond(DateTime d1, DateTime d2) {
diff --git a/tool/hop_runner.dart b/tool/hop_runner.dart
index 262c863..c1e1a21 100644
--- a/tool/hop_runner.dart
+++ b/tool/hop_runner.dart
@@ -16,14 +16,15 @@
//
addTask('analyze_libs', createAnalyzerTask(_getLibs));
- addTask('analyze_test_libs', createAnalyzerTask(
- ['test/harness_console.dart']));
+ addTask(
+ 'analyze_test_libs', createAnalyzerTask(['test/harness_console.dart']));
runHop(args);
}
Future<List<String>> _getLibs() {
- return new Directory('lib').list()
+ return new Directory('lib')
+ .list()
.where((FileSystemEntity fse) => fse is File)
.map((File file) => file.path)
.toList();
